From fdb22bd1854d245c0422463edbd16796caaaf892 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Mon, 19 Sep 2016 17:15:57 -0700
Subject: [PATCH 01/70] refactor: misc cleanup (#11654)

---
 .../@angular/benchpress/src/measure_values.ts |  7 +---
 .../benchpress/src/metric/user_metric.ts      |  6 +--
 .../test/metric/perflog_metric_spec.ts        |  2 +-
 .../test/metric/user_metric_spec.ts           |  2 +-
 .../compiler/src/expression_parser/ast.ts     |  2 +-
 .../src/view_compiler/compile_element.ts      |  2 +-
 .../testing/directive_resolver_mock.ts        |  5 +--
 .../testing/ng_module_resolver_mock.ts        | 16 +++----
 .../compiler/testing/pipe_resolver_mock.ts    |  2 -
 .../compiler/testing/resource_loader_mock.ts  |  4 +-
 .../core/src/animation/view_animation_map.ts  | 12 +++---
 .../core/src/di/reflective_injector.ts        |  6 +--
 .../@angular/core/src/linker/view_utils.ts    |  2 +-
 .../@angular/core/src/reflection/reflector.ts | 11 ++---
 .../core/src/testability/testability.ts       |  3 +-
 modules/@angular/facade/src/collection.ts     | 23 ++--------
 .../form_control_directive.ts                 |  3 +-
 .../form_group_directive.ts                   |  4 +-
 .../@angular/forms/src/directives/shared.ts   |  6 +--
 modules/@angular/forms/src/model.ts           |  5 +--
 modules/@angular/http/src/headers.ts          |  2 +-
 .../@angular/http/src/url_search_params.ts    | 42 +++++++------------
 .../http/test/backends/jsonp_backend_spec.ts  |  3 --
 .../http/test/backends/xhr_backend_spec.ts    |  3 --
 modules/@angular/http/test/headers_spec.ts    | 23 ++++------
 .../src/browser/browser_adapter.ts            |  2 +-
 .../src/dom/events/hammer_common.ts           |  5 +--
 .../src/dom/events/key_events.ts              |  2 +-
 .../test/dom/events/event_manager_spec.ts     | 31 +++++++-------
 .../platform-server/src/parse5_adapter.ts     | 22 ++++------
 .../shared/client_message_broker.ts           |  8 +---
 .../web_workers/shared/post_message_bus.ts    | 15 ++++---
 .../shared/service_message_broker.ts          |  3 +-
 .../src/web_workers/ui/event_serializer.ts    |  5 +--
 .../web_workers/worker/platform_location.ts   |  3 +-
 .../shared/web_worker_test_util.ts            | 14 +++----
 tools/public_api_guard/core/index.d.ts        |  2 +-
 37 files changed, 112 insertions(+), 196 deletions(-)

diff --git a/modules/@angular/benchpress/src/measure_values.ts b/modules/@angular/benchpress/src/measure_values.ts
index c8ef430a4086..13a67238dc41 100644
--- a/modules/@angular/benchpress/src/measure_values.ts
+++ b/modules/@angular/benchpress/src/measure_values.ts
@@ -6,18 +6,15 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Map} from './facade/collection';
-import {Date, DateWrapper} from './facade/lang';
-
 export class MeasureValues {
   constructor(
       public runIndex: number, public timeStamp: Date, public values: {[key: string]: any}) {}
 
   toJson() {
     return {
-      'timeStamp': DateWrapper.toJson(this.timeStamp),
+      'timeStamp': this.timeStamp.toJSON(),
       'runIndex': this.runIndex,
-      'values': this.values
+      'values': this.values,
     };
   }
 }
diff --git a/modules/@angular/benchpress/src/metric/user_metric.ts b/modules/@angular/benchpress/src/metric/user_metric.ts
index 05d43e5d98e1..e5828a1ebbf9 100644
--- a/modules/@angular/benchpress/src/metric/user_metric.ts
+++ b/modules/@angular/benchpress/src/metric/user_metric.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Inject, Injectable, OpaqueToken, Provider} from '@angular/core';
+import {Inject, Injectable} from '@angular/core';
 
 import {Options} from '../common_options';
 import {StringMapWrapper} from '../facade/collection';
@@ -48,9 +48,9 @@ export class UserMetric extends Metric {
             if (values.every(isNumber)) {
               Promise.all(names.map(name => adapter.executeScript(`delete window.${name}`)))
                   .then((_: any[]) => {
-                    let map = StringMapWrapper.create();
+                    let map: {[k: string]: any} = {};
                     for (let i = 0, n = names.length; i < n; i++) {
-                      StringMapWrapper.set(map, names[i], values[i]);
+                      map[names[i]] = values[i];
                     }
                     resolve(map);
                   }, reject);
diff --git a/modules/@angular/benchpress/test/metric/perflog_metric_spec.ts b/modules/@angular/benchpress/test/metric/perflog_metric_spec.ts
index d844fdc066e9..43f1a5ea447f 100644
--- a/modules/@angular/benchpress/test/metric/perflog_metric_spec.ts
+++ b/modules/@angular/benchpress/test/metric/perflog_metric_spec.ts
@@ -33,7 +33,7 @@ export function main() {
           new PerfLogFeatures({render: true, gc: true, frameCapture: true, userTiming: true});
     }
     if (isBlank(microMetrics)) {
-      microMetrics = StringMapWrapper.create();
+      microMetrics = {};
     }
     var providers: Provider[] = [
       Options.DEFAULT_PROVIDERS, PerflogMetric.PROVIDERS,
diff --git a/modules/@angular/benchpress/test/metric/user_metric_spec.ts b/modules/@angular/benchpress/test/metric/user_metric_spec.ts
index 48b33db31f29..9f034c56a56c 100644
--- a/modules/@angular/benchpress/test/metric/user_metric_spec.ts
+++ b/modules/@angular/benchpress/test/metric/user_metric_spec.ts
@@ -24,7 +24,7 @@ export function main() {
           new PerfLogFeatures({render: true, gc: true, frameCapture: true, userTiming: true});
     }
     if (isBlank(userMetrics)) {
-      userMetrics = StringMapWrapper.create();
+      userMetrics = {};
     }
     wdAdapter = new MockDriverAdapter();
     var providers: Provider[] = [
diff --git a/modules/@angular/compiler/src/expression_parser/ast.ts b/modules/@angular/compiler/src/expression_parser/ast.ts
index 331fe62d66ef..8c65ead52fbf 100644
--- a/modules/@angular/compiler/src/expression_parser/ast.ts
+++ b/modules/@angular/compiler/src/expression_parser/ast.ts
@@ -376,7 +376,7 @@ export class AstTransformer implements AstVisitor {
   }
 
   visitAll(asts: any[]): any[] {
-    var res = ListWrapper.createFixedSize(asts.length);
+    var res = new Array(asts.length);
     for (var i = 0; i < asts.length; ++i) {
       res[i] = asts[i].visit(this);
     }
diff --git a/modules/@angular/compiler/src/view_compiler/compile_element.ts b/modules/@angular/compiler/src/view_compiler/compile_element.ts
index f394d68dd9ad..01ee5d8cffe5 100644
--- a/modules/@angular/compiler/src/view_compiler/compile_element.ts
+++ b/modules/@angular/compiler/src/view_compiler/compile_element.ts
@@ -117,7 +117,7 @@ export class CompileElement extends CompileNode {
   setComponentView(compViewExpr: o.Expression) {
     this._compViewExpr = compViewExpr;
     this.contentNodesByNgContentIndex =
-        ListWrapper.createFixedSize(this.component.template.ngContentSelectors.length);
+        new Array(this.component.template.ngContentSelectors.length);
     for (var i = 0; i < this.contentNodesByNgContentIndex.length; i++) {
       this.contentNodesByNgContentIndex[i] = [];
     }
diff --git a/modules/@angular/compiler/testing/directive_resolver_mock.ts b/modules/@angular/compiler/testing/directive_resolver_mock.ts
index c2937cef007f..772538540561 100644
--- a/modules/@angular/compiler/testing/directive_resolver_mock.ts
+++ b/modules/@angular/compiler/testing/directive_resolver_mock.ts
@@ -8,8 +8,7 @@
 import {DirectiveResolver} from '@angular/compiler';
 import {AnimationEntryMetadata, Compiler, Component, Directive, Injectable, Injector, Provider, Type, resolveForwardRef} from '@angular/core';
 
-import {Map} from './facade/collection';
-import {isArray, isPresent} from './facade/lang';
+import {isPresent} from './facade/lang';
 import {ViewMetadata} from './private_import_core';
 
 
@@ -156,7 +155,7 @@ function flattenArray(tree: any[], out: Array<Type<any>|any[]>): void {
   if (!isPresent(tree)) return;
   for (var i = 0; i < tree.length; i++) {
     var item = resolveForwardRef(tree[i]);
-    if (isArray(item)) {
+    if (Array.isArray(item)) {
       flattenArray(item, out);
     } else {
       out.push(item);
diff --git a/modules/@angular/compiler/testing/ng_module_resolver_mock.ts b/modules/@angular/compiler/testing/ng_module_resolver_mock.ts
index 63cdbbb0e48d..7d0400e86d3b 100644
--- a/modules/@angular/compiler/testing/ng_module_resolver_mock.ts
+++ b/modules/@angular/compiler/testing/ng_module_resolver_mock.ts
@@ -9,18 +9,12 @@
 import {NgModuleResolver} from '@angular/compiler';
 import {Compiler, Injectable, Injector, NgModule, Type} from '@angular/core';
 
-import {Map} from './facade/collection';
-
 @Injectable()
 export class MockNgModuleResolver extends NgModuleResolver {
   private _ngModules = new Map<Type<any>, NgModule>();
 
   constructor(private _injector: Injector) { super(); }
 
-  private get _compiler(): Compiler { return this._injector.get(Compiler); }
-
-  private _clearCacheFor(component: Type<any>) { this._compiler.clearCacheFor(component); }
-
   /**
    * Overrides the {@link NgModule} for a module.
    */
@@ -36,10 +30,10 @@ export class MockNgModuleResolver extends NgModuleResolver {
    * `NgModuleResolver`, see `setNgModule`.
    */
   resolve(type: Type<any>, throwIfNotFound = true): NgModule {
-    var metadata = this._ngModules.get(type);
-    if (!metadata) {
-      metadata = super.resolve(type, throwIfNotFound);
-    }
-    return metadata;
+    return this._ngModules.get(type) || super.resolve(type, throwIfNotFound);
   }
+
+  private get _compiler(): Compiler { return this._injector.get(Compiler); }
+
+  private _clearCacheFor(component: Type<any>) { this._compiler.clearCacheFor(component); }
 }
diff --git a/modules/@angular/compiler/testing/pipe_resolver_mock.ts b/modules/@angular/compiler/testing/pipe_resolver_mock.ts
index bc103d562ee1..8bd538dacb2e 100644
--- a/modules/@angular/compiler/testing/pipe_resolver_mock.ts
+++ b/modules/@angular/compiler/testing/pipe_resolver_mock.ts
@@ -9,8 +9,6 @@
 import {PipeResolver} from '@angular/compiler';
 import {Compiler, Injectable, Injector, Pipe, Type} from '@angular/core';
 
-import {Map} from './facade/collection';
-
 @Injectable()
 export class MockPipeResolver extends PipeResolver {
   private _pipes = new Map<Type<any>, Pipe>();
diff --git a/modules/@angular/compiler/testing/resource_loader_mock.ts b/modules/@angular/compiler/testing/resource_loader_mock.ts
index 419a6b9946e0..65ee7bf63d74 100644
--- a/modules/@angular/compiler/testing/resource_loader_mock.ts
+++ b/modules/@angular/compiler/testing/resource_loader_mock.ts
@@ -7,11 +7,9 @@
  */
 
 import {ResourceLoader} from '@angular/compiler';
-import {ListWrapper, Map} from './facade/collection';
+import {ListWrapper} from './facade/collection';
 import {isBlank, normalizeBlank} from './facade/lang';
 
-
-
 /**
  * A mock implementation of {@link ResourceLoader} that allows outgoing requests to be mocked
  * and responded to within a single test, without going to the network.
diff --git a/modules/@angular/core/src/animation/view_animation_map.ts b/modules/@angular/core/src/animation/view_animation_map.ts
index fd3c6e3af9df..1f013bf567ad 100644
--- a/modules/@angular/core/src/animation/view_animation_map.ts
+++ b/modules/@angular/core/src/animation/view_animation_map.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ListWrapper, Map, StringMapWrapper} from '../facade/collection';
+import {ListWrapper, StringMapWrapper} from '../facade/collection';
 import {isPresent} from '../facade/lang';
 
 import {AnimationPlayer} from './animation_player';
@@ -47,12 +47,12 @@ export class ViewAnimationMap {
   getAllPlayers(): AnimationPlayer[] { return this._allPlayers; }
 
   remove(element: any, animationName: string): void {
-    var playersByAnimation = this._map.get(element);
-    if (isPresent(playersByAnimation)) {
-      var player = playersByAnimation[animationName];
+    const playersByAnimation = this._map.get(element);
+    if (playersByAnimation) {
+      const player = playersByAnimation[animationName];
       delete playersByAnimation[animationName];
-      var index = this._allPlayers.indexOf(player);
-      ListWrapper.removeAt(this._allPlayers, index);
+      const index = this._allPlayers.indexOf(player);
+      this._allPlayers.splice(index, 1);
 
       if (StringMapWrapper.isEmpty(playersByAnimation)) {
         this._map.delete(element);
diff --git a/modules/@angular/core/src/di/reflective_injector.ts b/modules/@angular/core/src/di/reflective_injector.ts
index 88bdcc134308..ef6a8a678df7 100644
--- a/modules/@angular/core/src/di/reflective_injector.ts
+++ b/modules/@angular/core/src/di/reflective_injector.ts
@@ -121,7 +121,7 @@ export class ReflectiveProtoInjectorDynamicStrategy implements ReflectiveProtoIn
   constructor(protoInj: ReflectiveProtoInjector, public providers: ResolvedReflectiveProvider[]) {
     var len = providers.length;
 
-    this.keyIds = ListWrapper.createFixedSize(len);
+    this.keyIds = new Array(len);
 
     for (var i = 0; i < len; i++) {
       this.keyIds[i] = providers[i].key.id;
@@ -286,7 +286,7 @@ export class ReflectiveInjectorDynamicStrategy implements ReflectiveInjectorStra
   constructor(
       public protoStrategy: ReflectiveProtoInjectorDynamicStrategy,
       public injector: ReflectiveInjector_) {
-    this.objs = ListWrapper.createFixedSize(protoStrategy.providers.length);
+    this.objs = new Array(protoStrategy.providers.length);
     ListWrapper.fill(this.objs, UNDEFINED);
   }
 
@@ -648,7 +648,7 @@ export class ReflectiveInjector_ implements ReflectiveInjector {
 
   private _instantiateProvider(provider: ResolvedReflectiveProvider): any {
     if (provider.multiProvider) {
-      var res = ListWrapper.createFixedSize(provider.resolvedFactories.length);
+      var res = new Array(provider.resolvedFactories.length);
       for (var i = 0; i < provider.resolvedFactories.length; ++i) {
         res[i] = this._instantiate(provider, provider.resolvedFactories[i]);
       }
diff --git a/modules/@angular/core/src/linker/view_utils.ts b/modules/@angular/core/src/linker/view_utils.ts
index ab7ee4637966..520039ab061b 100644
--- a/modules/@angular/core/src/linker/view_utils.ts
+++ b/modules/@angular/core/src/linker/view_utils.ts
@@ -77,7 +77,7 @@ export function ensureSlotCount(projectableNodes: any[][], expectedSlotCount: nu
     res = EMPTY_ARR;
   } else if (projectableNodes.length < expectedSlotCount) {
     var givenSlotCount = projectableNodes.length;
-    res = ListWrapper.createFixedSize(expectedSlotCount);
+    res = new Array(expectedSlotCount);
     for (var i = 0; i < expectedSlotCount; i++) {
       res[i] = (i < givenSlotCount) ? projectableNodes[i] : EMPTY_ARR;
     }
diff --git a/modules/@angular/core/src/reflection/reflector.ts b/modules/@angular/core/src/reflection/reflector.ts
index 9017dfd291b3..024c1222361e 100644
--- a/modules/@angular/core/src/reflection/reflector.ts
+++ b/modules/@angular/core/src/reflection/reflector.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Map, MapWrapper, Set, SetWrapper, StringMapWrapper} from '../facade/collection';
+import {MapWrapper, SetWrapper, StringMapWrapper} from '../facade/collection';
 import {isPresent} from '../facade/lang';
 import {Type} from '../type';
 import {PlatformReflectionCapabilities} from './platform_reflection_capabilities';
@@ -40,14 +40,9 @@ export class Reflector extends ReflectorReader {
   /** @internal */
   _methods = new Map<string, MethodFn>();
   /** @internal */
-  _usedKeys: Set<any>;
-  reflectionCapabilities: PlatformReflectionCapabilities;
+  _usedKeys: Set<any> = null;
 
-  constructor(reflectionCapabilities: PlatformReflectionCapabilities) {
-    super();
-    this._usedKeys = null;
-    this.reflectionCapabilities = reflectionCapabilities;
-  }
+  constructor(public reflectionCapabilities: PlatformReflectionCapabilities) { super(); }
 
   updateCapabilities(caps: PlatformReflectionCapabilities) { this.reflectionCapabilities = caps; }
 
diff --git a/modules/@angular/core/src/testability/testability.ts b/modules/@angular/core/src/testability/testability.ts
index 8ef3d6726b0b..e0e86f4aa6e9 100644
--- a/modules/@angular/core/src/testability/testability.ts
+++ b/modules/@angular/core/src/testability/testability.ts
@@ -7,7 +7,7 @@
  */
 
 import {Injectable} from '../di';
-import {Map, MapWrapper} from '../facade/collection';
+import {MapWrapper} from '../facade/collection';
 import {scheduleMicroTask} from '../facade/lang';
 import {NgZone} from '../zone/ng_zone';
 
@@ -110,6 +110,7 @@ export class Testability implements PublicTestability {
 
   getPendingRequestCount(): number { return this._pendingCount; }
 
+  /** @deprecated use findProviders */
   findBindings(using: any, provider: string, exactMatch: boolean): any[] {
     // TODO(juliemr): implement.
     return [];
diff --git a/modules/@angular/facade/src/collection.ts b/modules/@angular/facade/src/collection.ts
index 1308f2851899..fa4a76070671 100644
--- a/modules/@angular/facade/src/collection.ts
+++ b/modules/@angular/facade/src/collection.ts
@@ -8,12 +8,9 @@
 
 import {getSymbolIterator, global, isArray, isBlank, isJsObject, isPresent} from './lang';
 
-export var Map = global.Map;
-export var Set = global.Set;
-
 // Safari and Internet Explorer do not support the iterable parameter to the
 // Map constructor.  We work around that by manually adding the items.
-var createMapFromPairs: {(pairs: any[]): Map<any, any>} = (function() {
+const createMapFromPairs: {(pairs: any[]): Map<any, any>} = (function() {
   try {
     if (new Map(<any>[[1, 2]]).size === 1) {
       return function createMapFromPairs(pairs: any[]): Map<any, any> { return new Map(pairs); };
@@ -29,7 +26,7 @@ var createMapFromPairs: {(pairs: any[]): Map<any, any>} = (function() {
     return map;
   };
 })();
-var createMapFromMap: {(m: Map<any, any>): Map<any, any>} = (function() {
+const createMapFromMap: {(m: Map<any, any>): Map<any, any>} = (function() {
   try {
     if (new Map(<any>new Map())) {
       return function createMapFromMap(m: Map<any, any>): Map<any, any> { return new Map(<any>m); };
@@ -42,7 +39,7 @@ var createMapFromMap: {(m: Map<any, any>): Map<any, any>} = (function() {
     return map;
   };
 })();
-var _clearValues: {(m: Map<any, any>): void} = (function() {
+const _clearValues: {(m: Map<any, any>): void} = (function() {
   if ((<any>(new Map()).keys()).next) {
     return function _clearValues(m: Map<any, any>) {
       var keyIterator = m.keys();
@@ -69,7 +66,7 @@ var _arrayFromMap: {(m: Map<any, any>, getValues: boolean): any[]} = (function()
   } catch (e) {
   }
   return function createArrayFromMapWithForeach(m: Map<any, any>, getValues: boolean): any[] {
-    var res = ListWrapper.createFixedSize(m.size), i = 0;
+    var res = new Array(m.size), i = 0;
     m.forEach((v, k) => {
       res[i] = getValues ? v : k;
       i++;
@@ -79,7 +76,6 @@ var _arrayFromMap: {(m: Map<any, any>, getValues: boolean): any[]} = (function()
 })();
 
 export class MapWrapper {
-  static clone<K, V>(m: Map<K, V>): Map<K, V> { return createMapFromMap(m); }
   static createFromStringMap<T>(stringMap: {[key: string]: T}): Map<string, T> {
     var result = new Map<string, T>();
     for (var prop in stringMap) {
@@ -93,7 +89,6 @@ export class MapWrapper {
     return r;
   }
   static createFromPairs(pairs: any[]): Map<any, any> { return createMapFromPairs(pairs); }
-  static clearValues(m: Map<any, any>) { _clearValues(m); }
   static iterable<T>(m: T): T { return m; }
   static keys<K>(m: Map<K, any>): K[] { return _arrayFromMap(m, false); }
   static values<V>(m: Map<any, V>): V[] { return _arrayFromMap(m, true); }
@@ -103,15 +98,6 @@ export class MapWrapper {
  * Wraps Javascript Objects
  */
 export class StringMapWrapper {
-  static create(): {[k: /*any*/ string]: any} {
-    // Note: We are not using Object.create(null) here due to
-    // performance!
-    // http://jsperf.com/ng2-object-create-null
-    return {};
-  }
-  static contains(map: {[key: string]: any}, key: string): boolean {
-    return map.hasOwnProperty(key);
-  }
   static get<V>(map: {[key: string]: V}, key: string): V {
     return map.hasOwnProperty(key) ? map[key] : undefined;
   }
@@ -127,7 +113,6 @@ export class StringMapWrapper {
     }
     return true;
   }
-  static delete (map: {[key: string]: any}, key: string) { delete map[key]; }
   static forEach<K, V>(map: {[key: string]: V}, callback: (v: V, K: string) => void) {
     for (let k of Object.keys(map)) {
       callback(map[k], k);
diff --git a/modules/@angular/forms/src/directives/reactive_directives/form_control_directive.ts b/modules/@angular/forms/src/directives/reactive_directives/form_control_directive.ts
index d7afecc64d68..4db811043257 100644
--- a/modules/@angular/forms/src/directives/reactive_directives/form_control_directive.ts
+++ b/modules/@angular/forms/src/directives/reactive_directives/form_control_directive.ts
@@ -9,7 +9,6 @@
 import {Directive, Inject, Input, OnChanges, Optional, Output, Self, SimpleChanges, forwardRef} from '@angular/core';
 
 import {EventEmitter} from '../../facade/async';
-import {StringMapWrapper} from '../../facade/collection';
 import {FormControl} from '../../model';
 import {NG_ASYNC_VALIDATORS, NG_VALIDATORS} from '../../validators';
 import {ControlValueAccessor, NG_VALUE_ACCESSOR} from '../control_value_accessor';
@@ -117,6 +116,6 @@ export class FormControlDirective extends NgControl implements OnChanges {
               }
 
               private _isControlChanged(changes: {[key: string]: any}): boolean {
-                return StringMapWrapper.contains(changes, 'form');
+                return changes.hasOwnProperty('form');
               }
 }
diff --git a/modules/@angular/forms/src/directives/reactive_directives/form_group_directive.ts b/modules/@angular/forms/src/directives/reactive_directives/form_group_directive.ts
index baa102c01246..ab41b561fbe8 100644
--- a/modules/@angular/forms/src/directives/reactive_directives/form_group_directive.ts
+++ b/modules/@angular/forms/src/directives/reactive_directives/form_group_directive.ts
@@ -9,7 +9,7 @@
 import {Directive, Inject, Input, OnChanges, Optional, Output, Self, SimpleChanges, forwardRef} from '@angular/core';
 
 import {EventEmitter} from '../../facade/async';
-import {ListWrapper, StringMapWrapper} from '../../facade/collection';
+import {ListWrapper} from '../../facade/collection';
 import {isBlank} from '../../facade/lang';
 import {FormArray, FormControl, FormGroup} from '../../model';
 import {NG_ASYNC_VALIDATORS, NG_VALIDATORS, Validators} from '../../validators';
@@ -80,7 +80,7 @@ export class FormGroupDirective extends ControlContainer implements Form,
 
   ngOnChanges(changes: SimpleChanges): void {
     this._checkFormPresent();
-    if (StringMapWrapper.contains(changes, 'form')) {
+    if (changes.hasOwnProperty('form')) {
       this._updateValidators();
       this._updateDomValue();
       this._updateRegistrations();
diff --git a/modules/@angular/forms/src/directives/shared.ts b/modules/@angular/forms/src/directives/shared.ts
index 2ff9d746036f..b2b87668348e 100644
--- a/modules/@angular/forms/src/directives/shared.ts
+++ b/modules/@angular/forms/src/directives/shared.ts
@@ -7,7 +7,7 @@
  */
 
 
-import {ListWrapper, StringMapWrapper} from '../facade/collection';
+import {ListWrapper} from '../facade/collection';
 import {hasConstructor, isBlank, isPresent, looseIdentical} from '../facade/lang';
 import {FormArray, FormControl, FormGroup} from '../model';
 import {Validators} from '../validators';
@@ -120,8 +120,8 @@ export function composeAsyncValidators(validators: /* Array<Validator|Function>
 }
 
 export function isPropertyUpdated(changes: {[key: string]: any}, viewModel: any): boolean {
-  if (!StringMapWrapper.contains(changes, 'model')) return false;
-  var change = changes['model'];
+  if (!changes.hasOwnProperty('model')) return false;
+  const change = changes['model'];
 
   if (change.isFirstChange()) return true;
   return !looseIdentical(viewModel, change.currentValue);
diff --git a/modules/@angular/forms/src/model.ts b/modules/@angular/forms/src/model.ts
index a79f98faece3..7738c754bf2d 100644
--- a/modules/@angular/forms/src/model.ts
+++ b/modules/@angular/forms/src/model.ts
@@ -16,7 +16,6 @@ import {isBlank, isPresent, isStringMap, normalizeBool} from './facade/lang';
 import {isPromise} from './private_import_core';
 
 
-
 /**
  * Indicates that a FormControl is valid, i.e. that no errors exist in the input value.
  */
@@ -886,7 +885,7 @@ export class FormGroup extends AbstractControl {
    */
   removeControl(name: string): void {
     if (this.controls[name]) this.controls[name]._registerOnCollectionChange(() => {});
-    StringMapWrapper.delete(this.controls, name);
+    delete (this.controls[name]);
     this.updateValueAndValidity();
     this._onCollectionChange();
   }
@@ -896,7 +895,7 @@ export class FormGroup extends AbstractControl {
    */
   setControl(name: string, control: AbstractControl): void {
     if (this.controls[name]) this.controls[name]._registerOnCollectionChange(() => {});
-    StringMapWrapper.delete(this.controls, name);
+    delete (this.controls[name]);
     if (control) this.registerControl(name, control);
     this.updateValueAndValidity();
     this._onCollectionChange();
diff --git a/modules/@angular/http/src/headers.ts b/modules/@angular/http/src/headers.ts
index f22466ee7546..1bf2a0842e92 100644
--- a/modules/@angular/http/src/headers.ts
+++ b/modules/@angular/http/src/headers.ts
@@ -7,7 +7,7 @@
  */
 
 
-import {ListWrapper, Map, MapWrapper, StringMapWrapper, isListLikeIterable, iterateListLike} from '../src/facade/collection';
+import {ListWrapper, MapWrapper, StringMapWrapper, isListLikeIterable, iterateListLike} from '../src/facade/collection';
 import {isBlank} from '../src/facade/lang';
 
 
diff --git a/modules/@angular/http/src/url_search_params.ts b/modules/@angular/http/src/url_search_params.ts
index 6bda7d0800de..7703f1c871f3 100644
--- a/modules/@angular/http/src/url_search_params.ts
+++ b/modules/@angular/http/src/url_search_params.ts
@@ -6,9 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ListWrapper, Map, isListLikeIterable} from '../src/facade/collection';
-import {isPresent} from '../src/facade/lang';
-
 function paramParser(rawParams: string = ''): Map<string, string[]> {
   const map = new Map<string, string[]>();
   if (rawParams.length > 0) {
@@ -97,23 +94,16 @@ export class URLSearchParams {
   has(param: string): boolean { return this.paramsMap.has(param); }
 
   get(param: string): string {
-    var storedParam = this.paramsMap.get(param);
-    if (isListLikeIterable(storedParam)) {
-      return ListWrapper.first(storedParam);
-    } else {
-      return null;
-    }
-  }
+    const storedParam = this.paramsMap.get(param);
 
-  getAll(param: string): string[] {
-    var mapParam = this.paramsMap.get(param);
-    return isPresent(mapParam) ? mapParam : [];
+    return Array.isArray(storedParam) ? storedParam[0] : null;
   }
 
+  getAll(param: string): string[] { return this.paramsMap.get(param) || []; }
+
   set(param: string, val: string) {
-    var mapParam = this.paramsMap.get(param);
-    var list = isPresent(mapParam) ? mapParam : [];
-    ListWrapper.clear(list);
+    const list = this.paramsMap.get(param) || [];
+    list.length = 0;
     list.push(val);
     this.paramsMap.set(param, list);
   }
@@ -126,17 +116,15 @@ export class URLSearchParams {
   // TODO(@caitp): document this better
   setAll(searchParams: URLSearchParams) {
     searchParams.paramsMap.forEach((value, param) => {
-      var mapParam = this.paramsMap.get(param);
-      var list = isPresent(mapParam) ? mapParam : [];
-      ListWrapper.clear(list);
+      const list = this.paramsMap.get(param) || [];
+      list.length = 0;
       list.push(value[0]);
       this.paramsMap.set(param, list);
     });
   }
 
   append(param: string, val: string): void {
-    var mapParam = this.paramsMap.get(param);
-    var list = isPresent(mapParam) ? mapParam : [];
+    const list = this.paramsMap.get(param) || [];
     list.push(val);
     this.paramsMap.set(param, list);
   }
@@ -150,9 +138,8 @@ export class URLSearchParams {
   // TODO(@caitp): document this better
   appendAll(searchParams: URLSearchParams) {
     searchParams.paramsMap.forEach((value, param) => {
-      var mapParam = this.paramsMap.get(param);
-      var list = isPresent(mapParam) ? mapParam : [];
-      for (var i = 0; i < value.length; ++i) {
+      const list = this.paramsMap.get(param) || [];
+      for (let i = 0; i < value.length; ++i) {
         list.push(value[i]);
       }
       this.paramsMap.set(param, list);
@@ -169,9 +156,8 @@ export class URLSearchParams {
   // TODO(@caitp): document this better
   replaceAll(searchParams: URLSearchParams) {
     searchParams.paramsMap.forEach((value, param) => {
-      var mapParam = this.paramsMap.get(param);
-      var list = isPresent(mapParam) ? mapParam : [];
-      ListWrapper.clear(list);
+      const list = this.paramsMap.get(param) || [];
+      list.length = 0;
       for (var i = 0; i < value.length; ++i) {
         list.push(value[i]);
       }
@@ -180,7 +166,7 @@ export class URLSearchParams {
   }
 
   toString(): string {
-    var paramsList: string[] = [];
+    const paramsList: string[] = [];
     this.paramsMap.forEach((values, k) => {
       values.forEach(
           v => paramsList.push(
diff --git a/modules/@angular/http/test/backends/jsonp_backend_spec.ts b/modules/@angular/http/test/backends/jsonp_backend_spec.ts
index 87cc154583dc..da07e1f62eeb 100644
--- a/modules/@angular/http/test/backends/jsonp_backend_spec.ts
+++ b/modules/@angular/http/test/backends/jsonp_backend_spec.ts
@@ -9,19 +9,16 @@
 import {ReflectiveInjector} from '@angular/core';
 import {AsyncTestCompleter, SpyObject, afterEach, beforeEach, ddescribe, describe, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
 import {expect} from '@angular/platform-browser/testing/matchers';
-
 import {BrowserJsonp} from '../../src/backends/browser_jsonp';
 import {JSONPBackend, JSONPBackend_, JSONPConnection, JSONPConnection_} from '../../src/backends/jsonp_backend';
 import {BaseRequestOptions, RequestOptions} from '../../src/base_request_options';
 import {BaseResponseOptions, ResponseOptions} from '../../src/base_response_options';
 import {ReadyState, RequestMethod, ResponseType} from '../../src/enums';
-import {Map} from '../../src/facade/collection';
 import {isPresent} from '../../src/facade/lang';
 import {Request} from '../../src/static_request';
 import {Response} from '../../src/static_response';
 
 var existingScripts: MockBrowserJsonp[] = [];
-var unused: Response;
 
 class MockBrowserJsonp extends BrowserJsonp {
   src: string;
diff --git a/modules/@angular/http/test/backends/xhr_backend_spec.ts b/modules/@angular/http/test/backends/xhr_backend_spec.ts
index 216ecda5d774..78cb2bec6070 100644
--- a/modules/@angular/http/test/backends/xhr_backend_spec.ts
+++ b/modules/@angular/http/test/backends/xhr_backend_spec.ts
@@ -15,7 +15,6 @@ import {CookieXSRFStrategy, XHRBackend, XHRConnection} from '../../src/backends/
 import {BaseRequestOptions, RequestOptions} from '../../src/base_request_options';
 import {BaseResponseOptions, ResponseOptions} from '../../src/base_response_options';
 import {ResponseContentType, ResponseType} from '../../src/enums';
-import {Map} from '../../src/facade/collection';
 import {Json} from '../../src/facade/lang';
 import {Headers} from '../../src/headers';
 import {XSRFStrategy} from '../../src/interfaces';
@@ -27,9 +26,7 @@ var abortSpy: any;
 var sendSpy: any;
 var openSpy: any;
 var setRequestHeaderSpy: any;
-var addEventListenerSpy: any;
 var existingXHRs: MockBrowserXHR[] = [];
-var unused: Response;
 
 class MockBrowserXHR extends BrowserXhr {
   abort: any;
diff --git a/modules/@angular/http/test/headers_spec.ts b/modules/@angular/http/test/headers_spec.ts
index ae8593a1ef23..72c415fec3fe 100644
--- a/modules/@angular/http/test/headers_spec.ts
+++ b/modules/@angular/http/test/headers_spec.ts
@@ -7,8 +7,6 @@
  */
 
 import {beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
-
-import {Map, StringMapWrapper} from '../src/facade/collection';
 import {Json} from '../src/facade/lang';
 import {Headers} from '../src/headers';
 
@@ -24,21 +22,20 @@ export function main() {
       // Spec at https://tools.ietf.org/html/rfc2616
       expect(firstHeaders.get('content-type')).toBe('image/jpeg');
       expect(firstHeaders.get('content-Type')).toBe('image/jpeg');
-      var httpHeaders = StringMapWrapper.create();
-      StringMapWrapper.set(httpHeaders, 'Content-Type', 'image/jpeg');
-      StringMapWrapper.set(httpHeaders, 'Accept-Charset', 'utf-8');
-      StringMapWrapper.set(httpHeaders, 'X-My-Custom-Header', 'Zeke are cool');
-      var secondHeaders = new Headers(httpHeaders);
-      var secondHeadersObj = new Headers(secondHeaders);
+      const httpHeaders = {
+        'Content-Type': 'image/jpeg',
+        'Accept-Charset': 'utf-8',
+        'X-My-Custom-Header': 'Zeke are cool',
+      };
+      const secondHeaders = new Headers(httpHeaders);
+      const secondHeadersObj = new Headers(secondHeaders);
       expect(secondHeadersObj.get('Content-Type')).toBe('image/jpeg');
     });
 
 
     describe('initialization', () => {
       it('should merge values in provided dictionary', () => {
-        var map = StringMapWrapper.create();
-        StringMapWrapper.set(map, 'foo', 'bar');
-        var headers = new Headers(map);
+        var headers = new Headers({'foo': 'bar'});
         expect(headers.get('foo')).toBe('bar');
         expect(headers.getAll('foo')).toEqual(['bar']);
       });
@@ -55,9 +52,7 @@ export function main() {
 
     describe('.set()', () => {
       it('should clear all values and re-set for the provided key', () => {
-        var map = StringMapWrapper.create();
-        StringMapWrapper.set(map, 'foo', 'bar');
-        var headers = new Headers(map);
+        var headers = new Headers({'foo': 'bar'});
         expect(headers.get('foo')).toBe('bar');
         expect(headers.getAll('foo')).toEqual(['bar']);
         headers.set('foo', 'baz');
diff --git a/modules/@angular/platform-browser/src/browser/browser_adapter.ts b/modules/@angular/platform-browser/src/browser/browser_adapter.ts
index 4286e5b85c10..ff005f86f603 100644
--- a/modules/@angular/platform-browser/src/browser/browser_adapter.ts
+++ b/modules/@angular/platform-browser/src/browser/browser_adapter.ts
@@ -164,7 +164,7 @@ export class BrowserDomAdapter extends GenericBrowserDomAdapter {
   childNodes(el: any /** TODO #9100 */): Node[] { return el.childNodes; }
   childNodesAsList(el: any /** TODO #9100 */): any[] {
     var childNodes = el.childNodes;
-    var res = ListWrapper.createFixedSize(childNodes.length);
+    var res = new Array(childNodes.length);
     for (var i = 0; i < childNodes.length; i++) {
       res[i] = childNodes[i];
     }
diff --git a/modules/@angular/platform-browser/src/dom/events/hammer_common.ts b/modules/@angular/platform-browser/src/dom/events/hammer_common.ts
index 36256a11db08..63a4019abc9e 100644
--- a/modules/@angular/platform-browser/src/dom/events/hammer_common.ts
+++ b/modules/@angular/platform-browser/src/dom/events/hammer_common.ts
@@ -6,8 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {StringMapWrapper} from '../../facade/collection';
-
 import {EventManagerPlugin} from './event_manager';
 
 var _eventNames = {
@@ -53,7 +51,6 @@ export class HammerGesturesPluginCommon extends EventManagerPlugin {
   constructor() { super(); }
 
   supports(eventName: string): boolean {
-    eventName = eventName.toLowerCase();
-    return StringMapWrapper.contains(_eventNames, eventName);
+    return _eventNames.hasOwnProperty(eventName.toLowerCase());
   }
 }
diff --git a/modules/@angular/platform-browser/src/dom/events/key_events.ts b/modules/@angular/platform-browser/src/dom/events/key_events.ts
index b83ef7813bf1..d044539c3058 100644
--- a/modules/@angular/platform-browser/src/dom/events/key_events.ts
+++ b/modules/@angular/platform-browser/src/dom/events/key_events.ts
@@ -72,7 +72,7 @@ export class KeyEventsPlugin extends EventManagerPlugin {
       // returning null instead of throwing to let another plugin process the event
       return null;
     }
-    var result = StringMapWrapper.create();
+    var result = {};
     StringMapWrapper.set(result, 'domEventName', domEventName);
     StringMapWrapper.set(result, 'fullKey', fullKey);
     return result;
diff --git a/modules/@angular/platform-browser/test/dom/events/event_manager_spec.ts b/modules/@angular/platform-browser/test/dom/events/event_manager_spec.ts
index b16d7595af42..3e8cac85dce1 100644
--- a/modules/@angular/platform-browser/test/dom/events/event_manager_spec.ts
+++ b/modules/@angular/platform-browser/test/dom/events/event_manager_spec.ts
@@ -11,12 +11,10 @@ import {beforeEach, ddescribe, describe, expect, iit, it, xdescribe, xit} from '
 import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
 import {DomEventsPlugin} from '@angular/platform-browser/src/dom/events/dom_events';
 import {EventManager, EventManagerPlugin} from '@angular/platform-browser/src/dom/events/event_manager';
-
-import {ListWrapper, Map} from '../../../src/facade/collection';
 import {el} from '../../../testing/browser_util';
 
 export function main() {
-  var domEventPlugin: any /** TODO #9100 */;
+  var domEventPlugin: DomEventsPlugin;
 
   describe('EventManager', () => {
 
@@ -29,7 +27,7 @@ export function main() {
          var plugin = new FakeEventManagerPlugin(['click']);
          var manager = new EventManager([domEventPlugin, plugin], new FakeNgZone());
          manager.addEventListener(element, 'click', handler);
-         expect(plugin._eventHandler.get('click')).toBe(handler);
+         expect(plugin.eventHandler['click']).toBe(handler);
        });
 
     it('should delegate event bindings to the first plugin supporting the event', () => {
@@ -41,10 +39,8 @@ export function main() {
       var manager = new EventManager([plugin2, plugin1], new FakeNgZone());
       manager.addEventListener(element, 'click', clickHandler);
       manager.addEventListener(element, 'dblclick', dblClickHandler);
-      expect(plugin1._eventHandler.has('click')).toBe(false);
-      expect(plugin2._eventHandler.get('click')).toBe(clickHandler);
-      expect(plugin2._eventHandler.has('dblclick')).toBe(false);
-      expect(plugin1._eventHandler.get('dblclick')).toBe(dblClickHandler);
+      expect(plugin2.eventHandler['click']).toBe(clickHandler);
+      expect(plugin1.eventHandler['dblclick']).toBe(dblClickHandler);
     });
 
     it('should throw when no plugin can handle the event', () => {
@@ -91,22 +87,23 @@ export function main() {
   });
 }
 
+/** @internal */
 class FakeEventManagerPlugin extends EventManagerPlugin {
-  /** @internal */
-  _eventHandler = new Map<string, Function>();
-  constructor(public _supports: string[]) { super(); }
+  eventHandler: {[event: string]: Function} = {};
+
+  constructor(public supportedEvents: string[]) { super(); }
 
-  supports(eventName: string): boolean { return ListWrapper.contains(this._supports, eventName); }
+  supports(eventName: string): boolean { return this.supportedEvents.indexOf(eventName) > -1; }
 
-  addEventListener(element: any /** TODO #9100 */, eventName: string, handler: Function) {
-    this._eventHandler.set(eventName, handler);
-    return () => { this._eventHandler.delete(eventName); };
+  addEventListener(element: any, eventName: string, handler: Function) {
+    this.eventHandler[eventName] = handler;
+    return () => { delete (this.eventHandler[eventName]); };
   }
 }
 
 class FakeNgZone extends NgZone {
   constructor() { super({enableLongStackTrace: false}); }
-  run(fn: any /** TODO #9100 */) { fn(); }
+  run(fn: Function) { fn(); }
 
-  runOutsideAngular(fn: any /** TODO #9100 */) { return fn(); }
+  runOutsideAngular(fn: Function) { return fn(); }
 }
diff --git a/modules/@angular/platform-server/src/parse5_adapter.ts b/modules/@angular/platform-server/src/parse5_adapter.ts
index 59f29986ffdc..59bed8e648d2 100644
--- a/modules/@angular/platform-server/src/parse5_adapter.ts
+++ b/modules/@angular/platform-server/src/parse5_adapter.ts
@@ -12,8 +12,6 @@ import {ListWrapper, StringMapWrapper} from '../src/facade/collection';
 import {DomAdapter, setRootDomAdapter} from './private_import_platform-browser';
 import {isPresent, isBlank, global, setValueOnPath, DateWrapper} from '../src/facade/lang';
 import {SelectorMatcher, CssSelector} from './private_import_compiler';
-import {Type} from '@angular/core';
-import {ResourceLoader} from '@angular/compiler';
 
 var parser: any /** TODO #9100 */ = null;
 var serializer: any /** TODO #9100 */ = null;
@@ -136,17 +134,13 @@ export class Parse5DomAdapter extends DomAdapter {
     return result;
   }
   on(el: any /** TODO #9100 */, evt: any /** TODO #9100 */, listener: any /** TODO #9100 */) {
-    var listenersMap: {[k: /*any*/ string]: any} = el._eventListenersMap;
+    var listenersMap: {[k: string]: any} = el._eventListenersMap;
     if (isBlank(listenersMap)) {
-      var listenersMap: {[k: /*any*/ string]: any} = StringMapWrapper.create();
+      var listenersMap: {[k: string]: any} = {};
       el._eventListenersMap = listenersMap;
     }
-    var listeners = StringMapWrapper.get(listenersMap, evt);
-    if (isBlank(listeners)) {
-      listeners = [];
-    }
-    listeners.push(listener);
-    StringMapWrapper.set(listenersMap, evt, listeners);
+    const listeners = listenersMap[evt] || [];
+    listenersMap[evt] = [...listeners, listener];
   }
   onAndCancel(
       el: any /** TODO #9100 */, evt: any /** TODO #9100 */,
@@ -209,7 +203,7 @@ export class Parse5DomAdapter extends DomAdapter {
   childNodes(el: any /** TODO #9100 */): Node[] { return el.childNodes; }
   childNodesAsList(el: any /** TODO #9100 */): any[] {
     var childNodes = el.childNodes;
-    var res = ListWrapper.createFixedSize(childNodes.length);
+    var res = new Array(childNodes.length);
     for (var i = 0; i < childNodes.length; i++) {
       res[i] = childNodes[i];
     }
@@ -489,7 +483,7 @@ export class Parse5DomAdapter extends DomAdapter {
   }
   removeAttribute(element: any /** TODO #9100 */, attribute: string) {
     if (attribute) {
-      StringMapWrapper.delete(element.attribs, attribute);
+      delete element.attribs[attribute];
     }
   }
   removeAttributeNS(element: any /** TODO #9100 */, ns: string, name: string) {
@@ -507,7 +501,7 @@ export class Parse5DomAdapter extends DomAdapter {
     this.appendChild(newDoc, body);
     StringMapWrapper.set(newDoc, 'head', head);
     StringMapWrapper.set(newDoc, 'body', body);
-    StringMapWrapper.set(newDoc, '_window', StringMapWrapper.create());
+    StringMapWrapper.set(newDoc, '_window', {});
     return newDoc;
   }
   defaultDoc(): Document {
@@ -546,7 +540,7 @@ export class Parse5DomAdapter extends DomAdapter {
     var rules: any[] /** TODO #9100 */ = [];
     for (var i = 0; i < parsedRules.length; i++) {
       var parsedRule = parsedRules[i];
-      var rule: {[key: string]: any} = StringMapWrapper.create();
+      var rule: {[key: string]: any} = {};
       StringMapWrapper.set(rule, 'cssText', css);
       StringMapWrapper.set(rule, 'style', {content: '', cssText: ''});
       if (parsedRule.type == 'rule') {
diff --git a/modules/@angular/platform-webworker/src/web_workers/shared/client_message_broker.ts b/modules/@angular/platform-webworker/src/web_workers/shared/client_message_broker.ts
index df95b082537e..361edf67167e 100644
--- a/modules/@angular/platform-webworker/src/web_workers/shared/client_message_broker.ts
+++ b/modules/@angular/platform-webworker/src/web_workers/shared/client_message_broker.ts
@@ -156,15 +156,11 @@ class MessageData {
   }
 
   /**
-   * Returns the value from the StringMap if present. Otherwise returns null
+   * Returns the value if present, otherwise returns null
    * @internal
    */
   _getValueIfPresent(data: {[key: string]: any}, key: string) {
-    if (StringMapWrapper.contains(data, key)) {
-      return StringMapWrapper.get(data, key);
-    } else {
-      return null;
-    }
+    return data.hasOwnProperty(key) ? data[key] : null;
   }
 }
 
diff --git a/modules/@angular/platform-webworker/src/web_workers/shared/post_message_bus.ts b/modules/@angular/platform-webworker/src/web_workers/shared/post_message_bus.ts
index 8f09547e4c43..34253eb95ef2 100644
--- a/modules/@angular/platform-webworker/src/web_workers/shared/post_message_bus.ts
+++ b/modules/@angular/platform-webworker/src/web_workers/shared/post_message_bus.ts
@@ -9,7 +9,6 @@
 import {Injectable, NgZone} from '@angular/core';
 
 import {EventEmitter} from '../../facade/async';
-import {StringMapWrapper} from '../../facade/collection';
 
 import {MessageBus, MessageBusSink, MessageBusSource} from './message_bus';
 
@@ -22,7 +21,7 @@ export interface PostMessageTarget {
 
 export class PostMessageBusSink implements MessageBusSink {
   private _zone: NgZone;
-  private _channels: {[key: string]: _Channel} = StringMapWrapper.create();
+  private _channels: {[key: string]: _Channel} = {};
   private _messageBuffer: Array<Object> = [];
 
   constructor(private _postMessageTarget: PostMessageTarget) {}
@@ -34,7 +33,7 @@ export class PostMessageBusSink implements MessageBusSink {
   }
 
   initChannel(channel: string, runInZone: boolean = true): void {
-    if (StringMapWrapper.contains(this._channels, channel)) {
+    if (this._channels.hasOwnProperty(channel)) {
       throw new Error(`${channel} has already been initialized`);
     }
 
@@ -52,7 +51,7 @@ export class PostMessageBusSink implements MessageBusSink {
   }
 
   to(channel: string): EventEmitter<any> {
-    if (StringMapWrapper.contains(this._channels, channel)) {
+    if (this._channels.hasOwnProperty(channel)) {
       return this._channels[channel].emitter;
     } else {
       throw new Error(`${channel} is not set up. Did you forget to call initChannel?`);
@@ -71,7 +70,7 @@ export class PostMessageBusSink implements MessageBusSink {
 
 export class PostMessageBusSource implements MessageBusSource {
   private _zone: NgZone;
-  private _channels: {[key: string]: _Channel} = StringMapWrapper.create();
+  private _channels: {[key: string]: _Channel} = {};
 
   constructor(eventTarget?: EventTarget) {
     if (eventTarget) {
@@ -86,7 +85,7 @@ export class PostMessageBusSource implements MessageBusSource {
   attachToZone(zone: NgZone) { this._zone = zone; }
 
   initChannel(channel: string, runInZone: boolean = true) {
-    if (StringMapWrapper.contains(this._channels, channel)) {
+    if (this._channels.hasOwnProperty(channel)) {
       throw new Error(`${channel} has already been initialized`);
     }
 
@@ -96,7 +95,7 @@ export class PostMessageBusSource implements MessageBusSource {
   }
 
   from(channel: string): EventEmitter<any> {
-    if (StringMapWrapper.contains(this._channels, channel)) {
+    if (this._channels.hasOwnProperty(channel)) {
       return this._channels[channel].emitter;
     } else {
       throw new Error(`${channel} is not set up. Did you forget to call initChannel?`);
@@ -112,7 +111,7 @@ export class PostMessageBusSource implements MessageBusSource {
 
   private _handleMessage(data: any): void {
     var channel = data.channel;
-    if (StringMapWrapper.contains(this._channels, channel)) {
+    if (this._channels.hasOwnProperty(channel)) {
       var channelInfo = this._channels[channel];
       if (channelInfo.runInZone) {
         this._zone.run(() => { channelInfo.emitter.emit(data.message); });
diff --git a/modules/@angular/platform-webworker/src/web_workers/shared/service_message_broker.ts b/modules/@angular/platform-webworker/src/web_workers/shared/service_message_broker.ts
index ebbdca6ee7bb..fa118fc9e095 100644
--- a/modules/@angular/platform-webworker/src/web_workers/shared/service_message_broker.ts
+++ b/modules/@angular/platform-webworker/src/web_workers/shared/service_message_broker.ts
@@ -9,7 +9,6 @@
 import {Injectable, Type} from '@angular/core';
 
 import {EventEmitter} from '../../facade/async';
-import {ListWrapper, Map} from '../../facade/collection';
 import {FunctionWrapper, isPresent} from '../../facade/lang';
 import {MessageBus} from '../shared/message_bus';
 import {Serializer} from '../shared/serializer';
@@ -72,7 +71,7 @@ export class ServiceMessageBroker_ extends ServiceMessageBroker {
     this._methods.set(methodName, (message: ReceivedMessage) => {
       var serializedArgs = message.args;
       let numArgs = signature === null ? 0 : signature.length;
-      var deserializedArgs: any[] = ListWrapper.createFixedSize(numArgs);
+      var deserializedArgs: any[] = new Array(numArgs);
       for (var i = 0; i < numArgs; i++) {
         var serializedArg = serializedArgs[i];
         deserializedArgs[i] = this._serializer.deserialize(serializedArg, signature[i]);
diff --git a/modules/@angular/platform-webworker/src/web_workers/ui/event_serializer.ts b/modules/@angular/platform-webworker/src/web_workers/ui/event_serializer.ts
index f96fc01eafb0..3196ddf0d287 100644
--- a/modules/@angular/platform-webworker/src/web_workers/ui/event_serializer.ts
+++ b/modules/@angular/platform-webworker/src/web_workers/ui/event_serializer.ts
@@ -6,9 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Set} from '../../facade/collection';
-import {isPresent} from '../../facade/lang';
-
 const MOUSE_EVENT_PROPERTIES = [
   'altKey', 'button', 'clientX', 'clientY', 'metaKey', 'movementX', 'movementY', 'offsetX',
   'offsetY', 'region', 'screenX', 'screenY', 'shiftKey'
@@ -56,7 +53,7 @@ function addTarget(e: Event, serializedEvent: {[key: string]: any}): {[key: stri
   if (NODES_WITH_VALUE.has((<HTMLElement>e.target).tagName.toLowerCase())) {
     var target = <HTMLInputElement>e.target;
     serializedEvent['target'] = {'value': target.value};
-    if (isPresent(target.files)) {
+    if (target.files) {
       serializedEvent['target']['files'] = target.files;
     }
   }
diff --git a/modules/@angular/platform-webworker/src/web_workers/worker/platform_location.ts b/modules/@angular/platform-webworker/src/web_workers/worker/platform_location.ts
index a6d91c85eaa7..893663eca127 100644
--- a/modules/@angular/platform-webworker/src/web_workers/worker/platform_location.ts
+++ b/modules/@angular/platform-webworker/src/web_workers/worker/platform_location.ts
@@ -10,7 +10,6 @@ import {LocationChangeListener, PlatformLocation} from '@angular/common';
 import {Injectable} from '@angular/core';
 
 import {EventEmitter} from '../../facade/async';
-import {StringMapWrapper} from '../../facade/collection';
 import {StringWrapper} from '../../facade/lang';
 import {ClientMessageBroker, ClientMessageBrokerFactory, FnArg, UiArguments} from '../shared/client_message_broker';
 import {MessageBus} from '../shared/message_bus';
@@ -37,7 +36,7 @@ export class WebWorkerPlatformLocation extends PlatformLocation {
     this._channelSource.subscribe({
       next: (msg: {[key: string]: any}) => {
         var listeners: Array<Function> = null;
-        if (StringMapWrapper.contains(msg, 'event')) {
+        if (msg.hasOwnProperty('event')) {
           let type: string = msg['event']['type'];
           if (StringWrapper.equals(type, 'popstate')) {
             listeners = this._popStateListeners;
diff --git a/modules/@angular/platform-webworker/test/web_workers/shared/web_worker_test_util.ts b/modules/@angular/platform-webworker/test/web_workers/shared/web_worker_test_util.ts
index eef048e5f993..fb6e5ef72de1 100644
--- a/modules/@angular/platform-webworker/test/web_workers/shared/web_worker_test_util.ts
+++ b/modules/@angular/platform-webworker/test/web_workers/shared/web_worker_test_util.ts
@@ -16,8 +16,6 @@ import {SpyMessageBroker} from '../worker/spies';
 
 import {MockEventEmitter} from './mock_event_emitter';
 
-var __unused: Promise<any>;  // avoid unused import when Promise union types are erased
-
 /**
  * Returns two MessageBus instances that are attached to each other.
  * Such that whatever goes into one's sink comes out the others source.
@@ -49,9 +47,9 @@ export function expectBrokerCall(
     expect(args.method).toEqual(methodName);
     if (isPresent(vals)) {
       expect(args.args.length).toEqual(vals.length);
-      ListWrapper.forEachWithIndex(vals, (v, i) => { expect(v).toEqual(args.args[i].value); });
+      vals.forEach((v, i) => { expect(v).toEqual(args.args[i].value); });
     }
-    var promise: any /** TODO #9100 */ = null;
+    var promise: Promise<any>|void = null;
     if (isPresent(handler)) {
       let givenValues = args.args.map((arg) => arg.value);
       if (givenValues.length > 0) {
@@ -81,13 +79,13 @@ export class MockMessageBusSource implements MessageBusSource {
   constructor(private _channels: {[key: string]: MockEventEmitter<any>}) {}
 
   initChannel(channel: string, runInZone = true) {
-    if (!StringMapWrapper.contains(this._channels, channel)) {
+    if (!this._channels.hasOwnProperty(channel)) {
       this._channels[channel] = new MockEventEmitter();
     }
   }
 
   from(channel: string): MockEventEmitter<any> {
-    if (!StringMapWrapper.contains(this._channels, channel)) {
+    if (!this._channels.hasOwnProperty(channel)) {
       throw new Error(`${channel} is not set up. Did you forget to call initChannel?`);
     }
     return this._channels[channel];
@@ -100,13 +98,13 @@ export class MockMessageBusSink implements MessageBusSink {
   constructor(private _channels: {[key: string]: MockEventEmitter<any>}) {}
 
   initChannel(channel: string, runInZone = true) {
-    if (!StringMapWrapper.contains(this._channels, channel)) {
+    if (!this._channels.hasOwnProperty(channel)) {
       this._channels[channel] = new MockEventEmitter();
     }
   }
 
   to(channel: string): MockEventEmitter<any> {
-    if (!StringMapWrapper.contains(this._channels, channel)) {
+    if (!this._channels.hasOwnProperty(channel)) {
       this._channels[channel] = new MockEventEmitter();
     }
     return this._channels[channel];
diff --git a/tools/public_api_guard/core/index.d.ts b/tools/public_api_guard/core/index.d.ts
index 6077840e7bdf..d798eb2daf05 100644
--- a/tools/public_api_guard/core/index.d.ts
+++ b/tools/public_api_guard/core/index.d.ts
@@ -880,7 +880,7 @@ export declare abstract class TemplateRef<C> {
 export declare class Testability implements PublicTestability {
     constructor(_ngZone: NgZone);
     decreasePendingRequestCount(): number;
-    findBindings(using: any, provider: string, exactMatch: boolean): any[];
+    /** @deprecated */ findBindings(using: any, provider: string, exactMatch: boolean): any[];
     findProviders(using: any, provider: string, exactMatch: boolean): any[];
     getPendingRequestCount(): number;
     increasePendingRequestCount(): number;

From a95d65241c12b721b377a8b05a0ce66b432b769c Mon Sep 17 00:00:00 2001
From: Chuck Jazdzewski <chuckj@google.com>
Date: Tue, 20 Sep 2016 14:54:53 -0700
Subject: [PATCH 02/70] fix(compiler): Safe property access expressions work in
 event bindings (#11724)

---
 .../src/view_compiler/expression_converter.ts  |  6 +++---
 .../test/linker/regression_integration_spec.ts | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/modules/@angular/compiler/src/view_compiler/expression_converter.ts b/modules/@angular/compiler/src/view_compiler/expression_converter.ts
index fd44f95452ed..5fc635c58cc6 100644
--- a/modules/@angular/compiler/src/view_compiler/expression_converter.ts
+++ b/modules/@angular/compiler/src/view_compiler/expression_converter.ts
@@ -340,7 +340,7 @@ class _AstToIrVisitor implements cdAst.AstVisitor {
     // Notice that the first guard condition is the left hand of the left most safe access node
     // which comes in as leftMostSafe to this routine.
 
-    let guardedExpression = this.visit(leftMostSafe.receiver, mode);
+    let guardedExpression = this.visit(leftMostSafe.receiver, _Mode.Expression);
     let temporary: o.ReadVarExpr;
     if (this.needsTemporary(leftMostSafe.receiver)) {
       // If the expression has method calls or pipes then we need to save the result into a
@@ -369,7 +369,7 @@ class _AstToIrVisitor implements cdAst.AstVisitor {
     }
 
     // Recursively convert the node now without the guarded member access.
-    const access = this.visit(ast, mode);
+    const access = this.visit(ast, _Mode.Expression);
 
     // Remove the mapping. This is not strictly required as the converter only traverses each node
     // once but is safer if the conversion is changed to traverse the nodes more than once.
@@ -381,7 +381,7 @@ class _AstToIrVisitor implements cdAst.AstVisitor {
     }
 
     // Produce the conditional
-    return condition.conditional(o.literal(null), access);
+    return convertToStatementIfNeeded(mode, condition.conditional(o.literal(null), access));
   }
 
   // Given a expression of the form a?.b.c?.d.e the the left most safe node is
diff --git a/modules/@angular/core/test/linker/regression_integration_spec.ts b/modules/@angular/core/test/linker/regression_integration_spec.ts
index cf4575058fe7..838e0bfc98f6 100644
--- a/modules/@angular/core/test/linker/regression_integration_spec.ts
+++ b/modules/@angular/core/test/linker/regression_integration_spec.ts
@@ -79,6 +79,24 @@ function declareTests({useJit}: {useJit: boolean}) {
         expect(fixture.nativeElement).toHaveText('counting method value');
         expect(MyCountingComp.calls).toBe(1);
       });
+
+      it('should evalute a conditional in a statement binding', () => {
+        @Component({selector: 'some-comp', template: '<p (click)="nullValue?.click()"></p>'})
+        class SomeComponent {
+          nullValue: SomeReferencedClass;
+        }
+
+        class SomeReferencedClass {
+          click() {}
+        }
+
+        expect(() => {
+          const fixture = TestBed.configureTestingModule({declarations: [SomeComponent]})
+                              .createComponent(SomeComponent);
+
+          fixture.detectChanges(/* checkNoChanges */ false);
+        }).not.toThrow();
+      });
     });
 
     describe('providers', () => {

From d7d716d5dbf68bd7709fcdecbb2d108a51663112 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Tue, 20 Sep 2016 14:55:07 -0700
Subject: [PATCH 03/70] chore(zone.js): update to 0.6.25 (#11725)

---
 npm-shrinkwrap.clean.json | 2 +-
 npm-shrinkwrap.json       | 6 +++---
 package.json              | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/npm-shrinkwrap.clean.json b/npm-shrinkwrap.clean.json
index 39c732c834e2..49d01dec75de 100644
--- a/npm-shrinkwrap.clean.json
+++ b/npm-shrinkwrap.clean.json
@@ -4642,7 +4642,7 @@
       }
     },
     "zone.js": {
-      "version": "0.6.21"
+      "version": "0.6.25"
     }
   },
   "name": "angular-srcs",
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index e02c44f8bb22..549e18a18542 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -7414,9 +7414,9 @@
       }
     },
     "zone.js": {
-      "version": "0.6.21",
-      "from": "zone.js@0.6.21",
-      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.6.21.tgz"
+      "version": "0.6.25",
+      "from": "zone.js@>=0.6.24 <0.7.0",
+      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.6.25.tgz"
     }
   }
 }
diff --git a/package.json b/package.json
index 8f4e756af392..2a2caab06a9a 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "core-js": "^2.4.1",
     "reflect-metadata": "^0.1.3",
     "rxjs": "5.0.0-beta.12",
-    "zone.js": "^0.6.21"
+    "zone.js": "^0.6.25"
   },
   "devDependencies": {
     "@types/angularjs": "^1.5.13-alpha",

From 39e251eea7006f150adc5db45f757ef02bdca985 Mon Sep 17 00:00:00 2001
From: Kara <kara@users.noreply.github.com>
Date: Tue, 20 Sep 2016 14:55:47 -0700
Subject: [PATCH 04/70] fix(forms): support unbound disabled in ngModel
 (#11736)

---
 .../@angular/forms/src/directives/ng_model.ts |  4 +-
 .../@angular/forms/test/directives_spec.ts    | 41 ++++++++++++++++++-
 .../forms/test/template_integration_spec.ts   | 25 +++++++++++
 3 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/modules/@angular/forms/src/directives/ng_model.ts b/modules/@angular/forms/src/directives/ng_model.ts
index 5e32a25d775b..91c12295345c 100644
--- a/modules/@angular/forms/src/directives/ng_model.ts
+++ b/modules/@angular/forms/src/directives/ng_model.ts
@@ -200,7 +200,9 @@ export class NgModel extends NgControl implements OnChanges,
 
               private _updateDisabled(changes: SimpleChanges) {
                 const disabledValue = changes['isDisabled'].currentValue;
-                const isDisabled = disabledValue != null && disabledValue != false;
+
+                const isDisabled =
+                    disabledValue === '' || (disabledValue && disabledValue !== 'false');
 
                 resolvedPromise.then(() => {
                   if (isDisabled && !this.control.disabled) {
diff --git a/modules/@angular/forms/test/directives_spec.ts b/modules/@angular/forms/test/directives_spec.ts
index 877d1ec56b85..15286e7b95c1 100644
--- a/modules/@angular/forms/test/directives_spec.ts
+++ b/modules/@angular/forms/test/directives_spec.ts
@@ -485,7 +485,7 @@ export function main() {
     });
 
     describe('NgModel', () => {
-      var ngModel: any /** TODO #9100 */;
+      let ngModel: NgModel;
 
       beforeEach(() => {
         ngModel = new NgModel(
@@ -539,6 +539,45 @@ export function main() {
 
            expect(ngModel.control.errors).toEqual({'async': true});
          }));
+
+      it('should mark as disabled properly', fakeAsync(() => {
+           ngModel.ngOnChanges({isDisabled: new SimpleChange('', undefined)});
+           tick();
+           expect(ngModel.control.disabled).toEqual(false);
+
+           ngModel.ngOnChanges({isDisabled: new SimpleChange('', null)});
+           tick();
+           expect(ngModel.control.disabled).toEqual(false);
+
+           ngModel.ngOnChanges({isDisabled: new SimpleChange('', false)});
+           tick();
+           expect(ngModel.control.disabled).toEqual(false);
+
+           ngModel.ngOnChanges({isDisabled: new SimpleChange('', 'false')});
+           tick();
+           expect(ngModel.control.disabled).toEqual(false);
+
+           ngModel.ngOnChanges({isDisabled: new SimpleChange('', 0)});
+           tick();
+           expect(ngModel.control.disabled).toEqual(false);
+
+           ngModel.ngOnChanges({isDisabled: new SimpleChange(null, '')});
+           tick();
+           expect(ngModel.control.disabled).toEqual(true);
+
+           ngModel.ngOnChanges({isDisabled: new SimpleChange(null, 'true')});
+           tick();
+           expect(ngModel.control.disabled).toEqual(true);
+
+           ngModel.ngOnChanges({isDisabled: new SimpleChange(null, true)});
+           tick();
+           expect(ngModel.control.disabled).toEqual(true);
+
+           ngModel.ngOnChanges({isDisabled: new SimpleChange(null, 'anything else')});
+           tick();
+           expect(ngModel.control.disabled).toEqual(true);
+
+         }));
     });
 
     describe('FormControlName', () => {
diff --git a/modules/@angular/forms/test/template_integration_spec.ts b/modules/@angular/forms/test/template_integration_spec.ts
index 0af59cbfc090..271578159dc1 100644
--- a/modules/@angular/forms/test/template_integration_spec.ts
+++ b/modules/@angular/forms/test/template_integration_spec.ts
@@ -420,6 +420,31 @@ export function main() {
            });
          }));
 
+      it('should disable a control with unbound disabled attr', fakeAsync(() => {
+           TestBed.overrideComponent(NgModelForm, {
+             set: {
+               template: `
+            <form>
+             <input name="name" [(ngModel)]="name" disabled>
+            </form>
+          `,
+             }
+           });
+           const fixture = TestBed.createComponent(NgModelForm);
+           fixture.detectChanges();
+           tick();
+           const form = fixture.debugElement.children[0].injector.get(NgForm);
+           expect(form.control.get('name').disabled).toBe(true);
+
+           const input = fixture.debugElement.query(By.css('input'));
+           expect(input.nativeElement.disabled).toEqual(true);
+
+           form.control.enable();
+           fixture.detectChanges();
+           tick();
+           expect(input.nativeElement.disabled).toEqual(false);
+         }));
+
     });
 
     describe('radio controls', () => {

From 2860418a3cb9b16f88e1bc37ff1df036fe9cc141 Mon Sep 17 00:00:00 2001
From: Kara Erickson <karakara@google.com>
Date: Tue, 20 Sep 2016 09:08:12 -0700
Subject: [PATCH 05/70] fix(forms): disable all radios with disable()

---
 modules/@angular/forms/src/model.ts           | 12 +++--
 .../forms/test/reactive_integration_spec.ts   | 48 +++++++++++++++++++
 .../forms/test/template_integration_spec.ts   | 35 +++++++++++++-
 3 files changed, 89 insertions(+), 6 deletions(-)

diff --git a/modules/@angular/forms/src/model.ts b/modules/@angular/forms/src/model.ts
index 7738c754bf2d..5a9ac3bd0819 100644
--- a/modules/@angular/forms/src/model.ts
+++ b/modules/@angular/forms/src/model.ts
@@ -334,7 +334,7 @@ export abstract class AbstractControl {
     }
 
     this._updateAncestors(onlySelf);
-    this._onDisabledChange(true);
+    this._onDisabledChange.forEach((changeFn) => changeFn(true));
   }
 
   /**
@@ -350,7 +350,7 @@ export abstract class AbstractControl {
     this.updateValueAndValidity({onlySelf: true, emitEvent: emitEvent});
 
     this._updateAncestors(onlySelf);
-    this._onDisabledChange(false);
+    this._onDisabledChange.forEach((changeFn) => changeFn(false));
   }
 
   private _updateAncestors(onlySelf: boolean) {
@@ -595,7 +595,7 @@ export abstract class AbstractControl {
   }
 
   /** @internal */
-  _onDisabledChange(isDisabled: boolean): void {}
+  _onDisabledChange: Function[] = [];
 
   /** @internal */
   _isBoxedValue(formState: any): boolean {
@@ -770,14 +770,16 @@ export class FormControl extends AbstractControl {
    */
   _clearChangeFns(): void {
     this._onChange = [];
-    this._onDisabledChange = null;
+    this._onDisabledChange = [];
     this._onCollectionChange = () => {};
   }
 
   /**
    * Register a listener for disabled events.
    */
-  registerOnDisabledChange(fn: (isDisabled: boolean) => void): void { this._onDisabledChange = fn; }
+  registerOnDisabledChange(fn: (isDisabled: boolean) => void): void {
+    this._onDisabledChange.push(fn);
+  }
 
   /**
    * @internal
diff --git a/modules/@angular/forms/test/reactive_integration_spec.ts b/modules/@angular/forms/test/reactive_integration_spec.ts
index c763d04c64c9..d4763e0f39f8 100644
--- a/modules/@angular/forms/test/reactive_integration_spec.ts
+++ b/modules/@angular/forms/test/reactive_integration_spec.ts
@@ -1022,6 +1022,54 @@ export function main() {
 
         });
 
+        it('should disable all radio buttons when disable() is called', () => {
+          const fixture = TestBed.createComponent(FormControlRadioButtons);
+          const form =
+              new FormGroup({food: new FormControl('fish'), drink: new FormControl('cola')});
+          fixture.componentInstance.form = form;
+          fixture.detectChanges();
+
+          const inputs = fixture.debugElement.queryAll(By.css('input'));
+          expect(inputs[0].nativeElement.disabled).toEqual(false);
+          expect(inputs[1].nativeElement.disabled).toEqual(false);
+          expect(inputs[2].nativeElement.disabled).toEqual(false);
+          expect(inputs[3].nativeElement.disabled).toEqual(false);
+
+          form.get('food').disable();
+          expect(inputs[0].nativeElement.disabled).toEqual(true);
+          expect(inputs[1].nativeElement.disabled).toEqual(true);
+          expect(inputs[2].nativeElement.disabled).toEqual(false);
+          expect(inputs[3].nativeElement.disabled).toEqual(false);
+
+          form.disable();
+          expect(inputs[0].nativeElement.disabled).toEqual(true);
+          expect(inputs[1].nativeElement.disabled).toEqual(true);
+          expect(inputs[2].nativeElement.disabled).toEqual(true);
+          expect(inputs[3].nativeElement.disabled).toEqual(true);
+
+          form.enable();
+          expect(inputs[0].nativeElement.disabled).toEqual(false);
+          expect(inputs[1].nativeElement.disabled).toEqual(false);
+          expect(inputs[2].nativeElement.disabled).toEqual(false);
+          expect(inputs[3].nativeElement.disabled).toEqual(false);
+        });
+
+        it('should disable all radio buttons when initially disabled', () => {
+          const fixture = TestBed.createComponent(FormControlRadioButtons);
+          const form = new FormGroup({
+            food: new FormControl({value: 'fish', disabled: true}),
+            drink: new FormControl('cola')
+          });
+          fixture.componentInstance.form = form;
+          fixture.detectChanges();
+
+          const inputs = fixture.debugElement.queryAll(By.css('input'));
+          expect(inputs[0].nativeElement.disabled).toEqual(true);
+          expect(inputs[1].nativeElement.disabled).toEqual(true);
+          expect(inputs[2].nativeElement.disabled).toEqual(false);
+          expect(inputs[3].nativeElement.disabled).toEqual(false);
+        });
+
       });
 
       describe('custom value accessors', () => {
diff --git a/modules/@angular/forms/test/template_integration_spec.ts b/modules/@angular/forms/test/template_integration_spec.ts
index 271578159dc1..90d7f78bfcf0 100644
--- a/modules/@angular/forms/test/template_integration_spec.ts
+++ b/modules/@angular/forms/test/template_integration_spec.ts
@@ -445,6 +445,39 @@ export function main() {
            expect(input.nativeElement.disabled).toEqual(false);
          }));
 
+      it('should disable radio controls properly with programmatic call', fakeAsync(() => {
+           const fixture = TestBed.createComponent(NgModelRadioForm);
+           fixture.componentInstance.food = 'fish';
+           fixture.detectChanges();
+           tick();
+
+           const form = fixture.debugElement.children[0].injector.get(NgForm);
+           form.control.get('food').disable();
+           tick();
+
+           const inputs = fixture.debugElement.queryAll(By.css('input'));
+           expect(inputs[0].nativeElement.disabled).toBe(true);
+           expect(inputs[1].nativeElement.disabled).toBe(true);
+           expect(inputs[2].nativeElement.disabled).toBe(false);
+           expect(inputs[3].nativeElement.disabled).toBe(false);
+
+           form.control.disable();
+           tick();
+
+           expect(inputs[0].nativeElement.disabled).toBe(true);
+           expect(inputs[1].nativeElement.disabled).toBe(true);
+           expect(inputs[2].nativeElement.disabled).toBe(true);
+           expect(inputs[3].nativeElement.disabled).toBe(true);
+
+           form.control.enable();
+           tick();
+
+           expect(inputs[0].nativeElement.disabled).toBe(false);
+           expect(inputs[1].nativeElement.disabled).toBe(false);
+           expect(inputs[2].nativeElement.disabled).toBe(false);
+           expect(inputs[3].nativeElement.disabled).toBe(false);
+         }));
+
     });
 
     describe('radio controls', () => {
@@ -928,7 +961,7 @@ class NgModelOptionsStandalone {
     <form>
       <input type="radio" name="food" [(ngModel)]="food" value="chicken">
       <input type="radio" name="food"  [(ngModel)]="food" value="fish">
-      
+
       <input type="radio" name="drink" [(ngModel)]="drink" value="cola">
       <input type="radio" name="drink" [(ngModel)]="drink" value="sprite">
     </form>

From 20addf5f9fff5d17cb04bbf89b4282b857107001 Mon Sep 17 00:00:00 2001
From: Suguru Inatomi <laco0416@gmail.com>
Date: Fri, 23 Sep 2016 02:29:12 +0900
Subject: [PATCH 06/70] chore(ISSUE_TEMPLATE): update Angular version field
 (#11821)

---
 .github/ISSUE_TEMPLATE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 202ffbdec415..86c4d6d90b4a 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -20,7 +20,7 @@
 **Please tell us about your environment:**
 <!-- Operating system, IDE, package manager, HTTP server, ... -->
 
-* **Angular version:** 2.0.0-rc.X
+* **Angular version:** 2.0.X 
 <!-- Check whether this is still an issue in the most recent Angular version -->
 
 * **Browser:** [all | Chrome XX | Firefox XX | IE XX | Safari XX | Mobile Chrome XX | Android X.X Web Browser | iOS XX Safari | iOS XX UIWebView | iOS XX WKWebView ] 

From af6b219f8e91ed8c582eb1cc9ba3f86f3c3d68d0 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Thu, 22 Sep 2016 10:31:18 -0700
Subject: [PATCH 07/70] refactor(TemplateParser): clearer error message for on*
 binding (#11802)

fixes #11756
---
 .../src/template_parser/template_parser.ts    | 25 +++++--
 .../test/linker/security_integration_spec.ts  | 74 +++++++++++--------
 2 files changed, 62 insertions(+), 37 deletions(-)

diff --git a/modules/@angular/compiler/src/template_parser/template_parser.ts b/modules/@angular/compiler/src/template_parser/template_parser.ts
index 01fb272b1041..776ba51ae684 100644
--- a/modules/@angular/compiler/src/template_parser/template_parser.ts
+++ b/modules/@angular/compiler/src/template_parser/template_parser.ts
@@ -854,7 +854,7 @@ class TemplateParseVisitor implements html.Visitor {
         boundPropertyName = this._schemaRegistry.getMappedPropName(partValue);
         securityContext = this._schemaRegistry.securityContext(elementName, boundPropertyName);
         bindingType = PropertyBindingType.Property;
-        this._assertNoEventBinding(boundPropertyName, sourceSpan);
+        this._assertNoEventBinding(boundPropertyName, sourceSpan, false);
         if (!this._schemaRegistry.hasProperty(elementName, boundPropertyName, this._schemas)) {
           let errorMsg =
               `Can't bind to '${boundPropertyName}' since it isn't a known property of '${elementName}'.`;
@@ -869,7 +869,7 @@ class TemplateParseVisitor implements html.Visitor {
     } else {
       if (parts[0] == ATTRIBUTE_PREFIX) {
         boundPropertyName = parts[1];
-        this._assertNoEventBinding(boundPropertyName, sourceSpan);
+        this._assertNoEventBinding(boundPropertyName, sourceSpan, true);
         // NB: For security purposes, use the mapped property name, not the attribute name.
         const mapPropName = this._schemaRegistry.getMappedPropName(boundPropertyName);
         securityContext = this._schemaRegistry.securityContext(elementName, mapPropName);
@@ -902,12 +902,23 @@ class TemplateParseVisitor implements html.Visitor {
         boundPropertyName, bindingType, securityContext, ast, unit, sourceSpan);
   }
 
-  private _assertNoEventBinding(propName: string, sourceSpan: ParseSourceSpan): void {
+  /**
+   * @param propName the name of the property / attribute
+   * @param sourceSpan
+   * @param isAttr true when binding to an attribute
+   * @private
+   */
+  private _assertNoEventBinding(propName: string, sourceSpan: ParseSourceSpan, isAttr: boolean):
+      void {
     if (propName.toLowerCase().startsWith('on')) {
-      this._reportError(
-          `Binding to event attribute '${propName}' is disallowed ` +
-              `for security reasons, please use (${propName.slice(2)})=...`,
-          sourceSpan, ParseErrorLevel.FATAL);
+      let msg = `Binding to event attribute '${propName}' is disallowed for security reasons, ` +
+          `please use (${propName.slice(2)})=...`;
+      if (!isAttr) {
+        msg +=
+            `\nIf '${propName}' is a directive input, make sure the directive is imported by the` +
+            ` current module.`;
+      }
+      this._reportError(msg, sourceSpan, ParseErrorLevel.FATAL);
     }
   }
 
diff --git a/modules/@angular/core/test/linker/security_integration_spec.ts b/modules/@angular/core/test/linker/security_integration_spec.ts
index b0f302d3fa74..25a298237871 100644
--- a/modules/@angular/core/test/linker/security_integration_spec.ts
+++ b/modules/@angular/core/test/linker/security_integration_spec.ts
@@ -6,9 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA} from '@angular/core';
-import {Component} from '@angular/core/src/metadata';
-import {TestBed, getTestBed} from '@angular/core/testing';
+import {Component, Directive, Input, NO_ERRORS_SCHEMA} from '@angular/core';
+import {ComponentFixture, TestBed, getTestBed} from '@angular/core/testing';
 import {afterEach, beforeEach, beforeEachProviders, ddescribe, describe, expect, iit, inject, it} from '@angular/core/testing/testing_internal';
 import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
 import {DomSanitizer} from '@angular/platform-browser/src/security/dom_sanitization_service';
@@ -24,12 +23,22 @@ class SecuredComponent {
   ctxProp: any = 'some value';
 }
 
+@Directive({selector: '[onPrefixedProp]'})
+class OnPrefixDir {
+  @Input() onPrefixedProp: any;
+  @Input() onclick: any;
+}
+
 function declareTests({useJit}: {useJit: boolean}) {
   describe('security integration tests', function() {
 
     beforeEach(() => {
-      TestBed.configureCompiler({useJit: useJit});
-      TestBed.configureTestingModule({declarations: [SecuredComponent]});
+      TestBed.configureCompiler({useJit: useJit}).configureTestingModule({
+        declarations: [
+          SecuredComponent,
+          OnPrefixDir,
+        ]
+      });
     });
 
     let originalLog: (msg: any) => any;
@@ -43,15 +52,10 @@ function declareTests({useJit}: {useJit: boolean}) {
       it('should disallow binding to attr.on*', () => {
         const template = `<div [attr.onclick]="ctxProp"></div>`;
         TestBed.overrideComponent(SecuredComponent, {set: {template}});
-        try {
-          TestBed.createComponent(SecuredComponent);
-          throw 'Should throw';
-        } catch (e) {
-          expect(e.message).toContain(
-              `Template parse errors:\n` +
-              `Binding to event attribute 'onclick' is disallowed ` +
-              `for security reasons, please use (click)=... `);
-        }
+
+        expect(() => TestBed.createComponent(SecuredComponent))
+            .toThrowError(
+                /Binding to event attribute 'onclick' is disallowed for security reasons, please use \(click\)=.../);
       });
 
       it('should disallow binding to on* with NO_ERRORS_SCHEMA', () => {
@@ -59,17 +63,31 @@ function declareTests({useJit}: {useJit: boolean}) {
         TestBed.overrideComponent(SecuredComponent, {set: {template}}).configureTestingModule({
           schemas: [NO_ERRORS_SCHEMA]
         });
-        ;
-        try {
-          TestBed.createComponent(SecuredComponent);
-          throw 'Should throw';
-        } catch (e) {
-          expect(e.message).toContain(
-              `Template parse errors:\n` +
-              `Binding to event attribute 'onclick' is disallowed ` +
-              `for security reasons, please use (click)=... `);
-        }
+
+        expect(() => TestBed.createComponent(SecuredComponent))
+            .toThrowError(
+                /Binding to event attribute 'onclick' is disallowed for security reasons, please use \(click\)=.../);
+      });
+
+      it('should disallow binding to on* unless it is consumed by a directive', () => {
+        const template = `<div [onPrefixedProp]="ctxProp" [onclick]="ctxProp"></div>`;
+        TestBed.overrideComponent(SecuredComponent, {set: {template}}).configureTestingModule({
+          schemas: [NO_ERRORS_SCHEMA]
+        });
+
+        // should not throw for inputs starting with "on"
+        let cmp: ComponentFixture<SecuredComponent>;
+        expect(() => cmp = TestBed.createComponent(SecuredComponent)).not.toThrow();
+
+        // must bind to the directive not to the property of the div
+        const value = cmp.componentInstance.ctxProp = {};
+        cmp.detectChanges();
+        const div = cmp.debugElement.children[0];
+        expect(div.injector.get(OnPrefixDir).onclick).toBe(value);
+        expect(getDOM().getProperty(div.nativeElement, 'onclick')).not.toBe(value);
+        expect(getDOM().hasAttribute(div.nativeElement, 'onclick')).toEqual(false);
       });
+
     });
 
     describe('safe HTML values', function() {
@@ -157,12 +175,8 @@ function declareTests({useJit}: {useJit: boolean}) {
         const template = `<svg:circle [xlink:href]="ctxProp">Text</svg:circle>`;
         TestBed.overrideComponent(SecuredComponent, {set: {template}});
 
-        try {
-          TestBed.createComponent(SecuredComponent);
-          throw 'Should throw';
-        } catch (e) {
-          expect(e.message).toContain(`Can't bind to 'xlink:href'`);
-        }
+        expect(() => TestBed.createComponent(SecuredComponent))
+            .toThrowError(/Can't bind to 'xlink:href'/);
       });
 
       it('should escape unsafe HTML values', () => {

From f218e240d3088811095505905753bc37d989980f Mon Sep 17 00:00:00 2001
From: Marc Laval <mlaval@amadeus.com>
Date: Thu, 22 Sep 2016 19:31:38 +0200
Subject: [PATCH 08/70] ci(BrowserStack): add Safari 10 (#11796)

---
 browser-providers.conf.js | 42 +++++++++++++++++++++++++++++++--------
 1 file changed, 34 insertions(+), 8 deletions(-)

diff --git a/browser-providers.conf.js b/browser-providers.conf.js
index 5143e9adca6e..6107380903bd 100644
--- a/browser-providers.conf.js
+++ b/browser-providers.conf.js
@@ -22,9 +22,11 @@ var CIconfiguration = {
   'Safari7':      { unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}},
   'Safari8':      { unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}},
   'Safari9':      { unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}},
+  'Safari10':     { unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}},
   'iOS7':         { unitTest: {target: 'BS', required: true}, e2e: {target: null, required: true}},
   'iOS8':         { unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}},
   'iOS9':         { unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}},
+  'iOS10':        { unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}},
   'WindowsPhone': { unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}}
 };
 
@@ -83,6 +85,12 @@ var customLaunchers = {
     platform: 'OS X 10.11',
     version: '9.0'
   },
+  'SL_SAFARI10': {
+    base: 'SauceLabs',
+    browserName: 'safari',
+    platform: 'OS X 10.12',
+    version: '10.0'
+  },
   'SL_IOS7': {
     base: 'SauceLabs',
     browserName: 'iphone',
@@ -101,6 +109,12 @@ var customLaunchers = {
     platform: 'OS X 10.10',
     version: '9.3'
   },
+  'SL_IOS10': {
+    base: 'SauceLabs',
+    browserName: 'iphone',
+    platform: 'OS X 10.10',
+    version: '10.0'
+  },
   'SL_IE9': {
     base: 'SauceLabs',
     browserName: 'internet explorer',
@@ -186,6 +200,12 @@ var customLaunchers = {
     os: 'OS X',
     os_version: 'El Capitan'
   },
+  'BS_SAFARI10': {
+    base: 'BrowserStack',
+    browser: 'safari',
+    os: 'OS X',
+    os_version: 'Sierra'
+  },
   'BS_IOS7': {
     base: 'BrowserStack',
     device: 'iPhone 5S',
@@ -204,6 +224,12 @@ var customLaunchers = {
     os: 'ios',
     os_version: '9.1'
   },
+  'BS_IOS10': {
+    base: 'BrowserStack',
+    device: 'iPhone SE',
+    os: 'ios',
+    os_version: '10.0'
+  },
   'BS_IE9': {
     base: 'BrowserStack',
     browser: 'ie',
@@ -271,12 +297,12 @@ var customLaunchers = {
 
 var sauceAliases = {
   'ALL': Object.keys(customLaunchers).filter(function(item) {return customLaunchers[item].base == 'SauceLabs';}),
-  'DESKTOP': ['SL_CHROME', 'SL_FIREFOX', 'SL_IE9', 'SL_IE10', 'SL_IE11', 'SL_EDGE', 'SL_SAFARI7', 'SL_SAFARI8', 'SL_SAFARI9'],
-  'MOBILE': ['SL_ANDROID4.1', 'SL_ANDROID4.2', 'SL_ANDROID4.3', 'SL_ANDROID4.4', 'SL_ANDROID5', 'SL_IOS7', 'SL_IOS8', 'SL_IOS9'],
+  'DESKTOP': ['SL_CHROME', 'SL_FIREFOX', 'SL_IE9', 'SL_IE10', 'SL_IE11', 'SL_EDGE', 'SL_SAFARI7', 'SL_SAFARI8', 'SL_SAFARI9', 'SL_SAFARI10'],
+  'MOBILE': ['SL_ANDROID4.1', 'SL_ANDROID4.2', 'SL_ANDROID4.3', 'SL_ANDROID4.4', 'SL_ANDROID5', 'SL_IOS7', 'SL_IOS8', 'SL_IOS9', 'SL_IOS10'],
   'ANDROID': ['SL_ANDROID4.1', 'SL_ANDROID4.2', 'SL_ANDROID4.3', 'SL_ANDROID4.4', 'SL_ANDROID5'],
   'IE': ['SL_IE9', 'SL_IE10', 'SL_IE11'],
-  'IOS': ['SL_IOS7', 'SL_IOS8', 'SL_IOS9'],
-  'SAFARI': ['SL_SAFARI7', 'SL_SAFARI8', 'SL_SAFARI9'],
+  'IOS': ['SL_IOS7', 'SL_IOS8', 'SL_IOS9', 'SL_IOS10'],
+  'SAFARI': ['SL_SAFARI7', 'SL_SAFARI8', 'SL_SAFARI9', 'SL_SAFARI10'],
   'BETA': ['SL_CHROMEBETA', 'SL_FIREFOXBETA'],
   'DEV': ['SL_CHROMEDEV', 'SL_FIREFOXDEV'],
   'CI_REQUIRED': buildConfiguration('unitTest', 'SL', true),
@@ -285,12 +311,12 @@ var sauceAliases = {
 
 var browserstackAliases = {
   'ALL': Object.keys(customLaunchers).filter(function(item) {return customLaunchers[item].base == 'BrowserStack';}),
-  'DESKTOP': ['BS_CHROME', 'BS_FIREFOX', 'BS_IE9', 'BS_IE10', 'BS_IE11', 'BS_EDGE', 'BS_SAFARI7', 'BS_SAFARI8', 'BS_SAFARI9'],
-  'MOBILE': ['BS_ANDROID4.3', 'BS_ANDROID4.4', 'BS_IOS7', 'BS_IOS8', 'BS_IOS9', 'BS_WINDOWSPHONE'],
+  'DESKTOP': ['BS_CHROME', 'BS_FIREFOX', 'BS_IE9', 'BS_IE10', 'BS_IE11', 'BS_EDGE', 'BS_SAFARI7', 'BS_SAFARI8', 'BS_SAFARI9', 'BS_SAFARI10'],
+  'MOBILE': ['BS_ANDROID4.3', 'BS_ANDROID4.4', 'BS_IOS7', 'BS_IOS8', 'BS_IOS9', 'BS_IOS10', 'BS_WINDOWSPHONE'],
   'ANDROID': ['BS_ANDROID4.3', 'BS_ANDROID4.4'],
   'IE': ['BS_IE9', 'BS_IE10', 'BS_IE11'],
-  'IOS': ['BS_IOS7', 'BS_IOS8', 'BS_IOS9'],
-  'SAFARI': ['BS_SAFARI7', 'BS_SAFARI8', 'BS_SAFARI9'],
+  'IOS': ['BS_IOS7', 'BS_IOS8', 'BS_IOS9', 'BS_IOS10'],
+  'SAFARI': ['BS_SAFARI7', 'BS_SAFARI8', 'BS_SAFARI9', 'BS_SAFARI10'],
   'CI_REQUIRED': buildConfiguration('unitTest', 'BS', true),
   'CI_OPTIONAL': buildConfiguration('unitTest', 'BS', false)
 };

From 51e2b9c0733ce9dd1a176aaffad473c270f65c36 Mon Sep 17 00:00:00 2001
From: Stephen Fluin <stephen.fluin@gmail.com>
Date: Thu, 22 Sep 2016 10:31:56 -0700
Subject: [PATCH 09/70] docs(contributing): remove preview references (#11795)

---
 CONTRIBUTING.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ca3f837068ad..cadac6f60bd3 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -18,7 +18,7 @@ Help us keep Angular open and inclusive. Please read and follow our [Code of Con
 ## <a name="question"></a> Got a Question or Problem?
 
 If you have questions about how to *use* Angular, please direct them to the [Google Group][angular-group]
-discussion list or [StackOverflow][stackoverflow]. Please note that Angular 2 is still in early developer preview, and the core team's capacity to answer usage questions is limited. We are also available on [Gitter][gitter].
+discussion list or [StackOverflow][stackoverflow]. Please note that the Angular team's capacity to answer usage questions is limited. We are also available on [Gitter][gitter].
 
 ## <a name="issue"></a> Found an Issue?
 If you find a bug in the source code, you can help us by
@@ -28,8 +28,7 @@ If you find a bug in the source code, you can help us by
 ## <a name="feature"></a> Want a Feature?
 You can *request* a new feature by [submitting an issue](#submit-issue) to our [GitHub
 Repository][github]. If you would like to *implement* a new feature, please submit an issue with
-a proposal for your work first, to be sure that we can use it. Angular 2 is in developer preview
-and we are not ready to accept major contributions ahead of the full release.
+a proposal for your work first, to be sure that we can use it.
 Please consider what kind of change it is:
 
 * For a **Major Feature**, first open an issue and outline your proposal so that it can be

From 0e18c57a17df3b8891314728cf1fdb6470cceef7 Mon Sep 17 00:00:00 2001
From: Igor Minar <iminar@google.com>
Date: Thu, 22 Sep 2016 10:32:17 -0700
Subject: [PATCH 10/70] docs(core): mark TestBed as stable api and add
 preliminary docs (#11767)

TestBed was accidentaly ommited from the 'stable' api list during the API sweep before final. We do consider it to be stable.
---
 modules/@angular/core/testing/test_bed.ts      | 8 +++++++-
 tools/public_api_guard/core/testing/index.d.ts | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/@angular/core/testing/test_bed.ts b/modules/@angular/core/testing/test_bed.ts
index 05b70271fac6..e519228f8ebc 100644
--- a/modules/@angular/core/testing/test_bed.ts
+++ b/modules/@angular/core/testing/test_bed.ts
@@ -47,7 +47,13 @@ export type TestModuleMetadata = {
 };
 
 /**
- * @experimental
+ * @whatItDoes Configures and initializes environment for unit testing and provides methods for
+ * creating components and services in unit tests.
+ * @description
+ *
+ * TestBed is the primary api for writing unit tests for Angular applications and libraries.
+ *
+ * @stable
  */
 export class TestBed implements Injector {
   /**
diff --git a/tools/public_api_guard/core/testing/index.d.ts b/tools/public_api_guard/core/testing/index.d.ts
index 48d525558363..3dbd951a7423 100644
--- a/tools/public_api_guard/core/testing/index.d.ts
+++ b/tools/public_api_guard/core/testing/index.d.ts
@@ -56,7 +56,7 @@ export declare type MetadataOverride<T> = {
 /** @experimental */
 export declare function resetFakeAsyncZone(): void;
 
-/** @experimental */
+/** @stable */
 export declare class TestBed implements Injector {
     ngModule: Type<any>;
     platform: PlatformRef;

From e09882180e055d2954a55fa50314e9655e0253ef Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Thu, 22 Sep 2016 10:34:00 -0700
Subject: [PATCH 11/70] refactor(common): cleanup (#11668)

---
 .../@angular/common/src/directives/ng_plural.ts  |  9 +++------
 .../@angular/common/src/directives/ng_style.ts   |  6 ++----
 .../@angular/common/src/directives/ng_switch.ts  | 16 +++++-----------
 modules/@angular/common/src/localization.ts      |  2 +-
 modules/@angular/common/src/location/location.ts | 12 ++++++++----
 modules/@angular/common/testing/location_mock.ts |  2 --
 modules/@angular/facade/src/errors.ts            | 11 ++---------
 7 files changed, 21 insertions(+), 37 deletions(-)

diff --git a/modules/@angular/common/src/directives/ng_plural.ts b/modules/@angular/common/src/directives/ng_plural.ts
index a34919570f64..0f4aa616e30b 100644
--- a/modules/@angular/common/src/directives/ng_plural.ts
+++ b/modules/@angular/common/src/directives/ng_plural.ts
@@ -61,8 +61,7 @@ export class NgPlural {
 
   addCase(value: string, switchView: SwitchView): void { this._caseViews[value] = switchView; }
 
-  /** @internal */
-  _updateView(): void {
+  private _updateView(): void {
     this._clearViews();
 
     const cases = Object.keys(this._caseViews);
@@ -70,13 +69,11 @@ export class NgPlural {
     this._activateView(this._caseViews[key]);
   }
 
-  /** @internal */
-  _clearViews() {
+  private _clearViews() {
     if (this._activeView) this._activeView.destroy();
   }
 
-  /** @internal */
-  _activateView(view: SwitchView) {
+  private _activateView(view: SwitchView) {
     if (view) {
       this._activeView = view;
       this._activeView.create();
diff --git a/modules/@angular/common/src/directives/ng_style.ts b/modules/@angular/common/src/directives/ng_style.ts
index dcedef2f4f59..a91f19051e7c 100644
--- a/modules/@angular/common/src/directives/ng_style.ts
+++ b/modules/@angular/common/src/directives/ng_style.ts
@@ -32,10 +32,8 @@ import {Directive, DoCheck, ElementRef, Input, KeyValueChangeRecord, KeyValueDif
  */
 @Directive({selector: '[ngStyle]'})
 export class NgStyle implements DoCheck {
-  /** @internal */
-  _ngStyle: {[key: string]: string};
-  /** @internal */
-  _differ: KeyValueDiffer;
+  private _ngStyle: {[key: string]: string};
+  private _differ: KeyValueDiffer;
 
   constructor(
       private _differs: KeyValueDiffers, private _ngEl: ElementRef, private _renderer: Renderer) {}
diff --git a/modules/@angular/common/src/directives/ng_switch.ts b/modules/@angular/common/src/directives/ng_switch.ts
index 05a4d8bdee94..32b3254d05a1 100644
--- a/modules/@angular/common/src/directives/ng_switch.ts
+++ b/modules/@angular/common/src/directives/ng_switch.ts
@@ -111,8 +111,7 @@ export class NgSwitch {
     }
   }
 
-  /** @internal */
-  _emptyAllActiveViews(): void {
+  private _emptyAllActiveViews(): void {
     const activeContainers = this._activeViews;
     for (var i = 0; i < activeContainers.length; i++) {
       activeContainers[i].destroy();
@@ -120,9 +119,7 @@ export class NgSwitch {
     this._activeViews = [];
   }
 
-  /** @internal */
-  _activateViews(views: SwitchView[]): void {
-    // TODO(vicb): assert(this._activeViews.length === 0);
+  private _activateViews(views: SwitchView[]): void {
     if (views) {
       for (var i = 0; i < views.length; i++) {
         views[i].create();
@@ -141,8 +138,7 @@ export class NgSwitch {
     views.push(view);
   }
 
-  /** @internal */
-  _deregisterView(value: any, view: SwitchView): void {
+  private _deregisterView(value: any, view: SwitchView): void {
     // `_CASE_DEFAULT` is used a marker for non-registered cases
     if (value === _CASE_DEFAULT) return;
     const views = this._valueViews.get(value);
@@ -181,10 +177,8 @@ export class NgSwitch {
 @Directive({selector: '[ngSwitchCase]'})
 export class NgSwitchCase {
   // `_CASE_DEFAULT` is used as a marker for a not yet initialized value
-  /** @internal */
-  _value: any = _CASE_DEFAULT;
-  /** @internal */
-  _view: SwitchView;
+  private _value: any = _CASE_DEFAULT;
+  private _view: SwitchView;
   private _switch: NgSwitch;
 
   constructor(
diff --git a/modules/@angular/common/src/localization.ts b/modules/@angular/common/src/localization.ts
index a84e73442a6b..a6c64c6fa2ef 100644
--- a/modules/@angular/common/src/localization.ts
+++ b/modules/@angular/common/src/localization.ts
@@ -67,7 +67,7 @@ export enum Plural {
   Two,
   Few,
   Many,
-  Other
+  Other,
 }
 
 /**
diff --git a/modules/@angular/common/src/location/location.ts b/modules/@angular/common/src/location/location.ts
index 8ff9dc494c2f..dab13b008745 100644
--- a/modules/@angular/common/src/location/location.ts
+++ b/modules/@angular/common/src/location/location.ts
@@ -49,16 +49,20 @@ export class Location {
   _subject: EventEmitter<any> = new EventEmitter();
   /** @internal */
   _baseHref: string;
-
   /** @internal */
   _platformStrategy: LocationStrategy;
 
   constructor(platformStrategy: LocationStrategy) {
     this._platformStrategy = platformStrategy;
-    var browserBaseHref = this._platformStrategy.getBaseHref();
+    const browserBaseHref = this._platformStrategy.getBaseHref();
     this._baseHref = Location.stripTrailingSlash(_stripIndexHtml(browserBaseHref));
-    this._platformStrategy.onPopState(
-        (ev) => { this._subject.emit({'url': this.path(true), 'pop': true, 'type': ev.type}); });
+    this._platformStrategy.onPopState((ev) => {
+      this._subject.emit({
+        'url': this.path(true),
+        'pop': true,
+        'type': ev.type,
+      });
+    });
   }
 
   /**
diff --git a/modules/@angular/common/testing/location_mock.ts b/modules/@angular/common/testing/location_mock.ts
index 7b448bf44269..5b4d0c95908b 100644
--- a/modules/@angular/common/testing/location_mock.ts
+++ b/modules/@angular/common/testing/location_mock.ts
@@ -18,9 +18,7 @@ import {EventEmitter, Injectable} from '@angular/core';
 @Injectable()
 export class SpyLocation implements Location {
   urlChanges: string[] = [];
-  /** @internal */
   private _history: LocationState[] = [new LocationState('', '')];
-  /** @internal */
   private _historyIndex: number = 0;
   /** @internal */
   _subject: EventEmitter<any> = new EventEmitter();
diff --git a/modules/@angular/facade/src/errors.ts b/modules/@angular/facade/src/errors.ts
index bafd4e7182be..e45d83777eea 100644
--- a/modules/@angular/facade/src/errors.ts
+++ b/modules/@angular/facade/src/errors.ts
@@ -14,15 +14,13 @@ export function unimplemented(): any {
  * @stable
  */
 export class BaseError extends Error {
-  /**
-   * @internal
-   */
+  /** @internal **/
   _nativeError: Error;
 
   constructor(message: string) {
     // Errors don't use current this, instead they create a new instance.
     // We have to do forward all of our api to the nativeInstance.
-    var nativeError = super(message) as any as Error;
+    const nativeError = super(message) as any as Error;
     this._nativeError = nativeError;
   }
 
@@ -40,11 +38,6 @@ export class BaseError extends Error {
 export class WrappedError extends BaseError {
   originalError: any;
 
-  /**
-   * @internal
-   */
-  _nativeError: Error;
-
   constructor(message: string, error: any) {
     super(`${message} caused by: ${error instanceof Error ? error.message: error }`);
     this.originalError = error;

From 3e780c032e6dd634dfba414d9db9a1d3f947f016 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Tue, 20 Sep 2016 14:14:57 -0700
Subject: [PATCH 12/70] refactor: misc cleanup

---
 .../compiler/src/directive_normalizer.ts      | 23 ++++-----
 .../@angular/core/src/application_module.ts   |  1 -
 modules/@angular/core/src/application_ref.ts  | 50 +++++++++---------
 .../@angular/core/src/application_tokens.ts   |  2 +-
 .../@angular/core/src/linker/view_utils.ts    |  1 -
 modules/@angular/core/src/metadata.ts         |  2 -
 modules/@angular/core/src/metadata/view.ts    | 51 ++++---------------
 .../core/src/platform_core_providers.ts       |  9 ++--
 modules/@angular/core/src/type.ts             |  2 +-
 tools/public_api_guard/core/index.d.ts        |  2 +-
 10 files changed, 55 insertions(+), 88 deletions(-)

diff --git a/modules/@angular/compiler/src/directive_normalizer.ts b/modules/@angular/compiler/src/directive_normalizer.ts
index a8e067d89cc7..729b55f37288 100644
--- a/modules/@angular/compiler/src/directive_normalizer.ts
+++ b/modules/@angular/compiler/src/directive_normalizer.ts
@@ -115,27 +115,27 @@ export class DirectiveNormalizer {
     const templateStyles = this.normalizeStylesheet(new CompileStylesheetMetadata(
         {styles: visitor.styles, styleUrls: visitor.styleUrls, moduleUrl: templateAbsUrl}));
 
-    const allStyles = templateMetadataStyles.styles.concat(templateStyles.styles);
-    const allStyleUrls = templateMetadataStyles.styleUrls.concat(templateStyles.styleUrls);
-
     let encapsulation = templateMeta.encapsulation;
     if (isBlank(encapsulation)) {
       encapsulation = this._config.defaultEncapsulation;
     }
-    if (encapsulation === ViewEncapsulation.Emulated && allStyles.length === 0 &&
-        allStyleUrls.length === 0) {
+
+    const styles = templateMetadataStyles.styles.concat(templateStyles.styles);
+    const styleUrls = templateMetadataStyles.styleUrls.concat(templateStyles.styleUrls);
+
+    if (encapsulation === ViewEncapsulation.Emulated && styles.length === 0 &&
+        styleUrls.length === 0) {
       encapsulation = ViewEncapsulation.None;
     }
+
     return new CompileTemplateMetadata({
       encapsulation,
-      template: template,
-      templateUrl: templateAbsUrl,
-      styles: allStyles,
-      styleUrls: allStyleUrls,
+      template,
+      templateUrl: templateAbsUrl, styles, styleUrls,
       externalStylesheets: templateMeta.externalStylesheets,
       ngContentSelectors: visitor.ngContentSelectors,
       animations: templateMeta.animations,
-      interpolation: templateMeta.interpolation
+      interpolation: templateMeta.interpolation,
     });
   }
 
@@ -251,7 +251,6 @@ function _cloneDirectiveWithTemplate(
     viewProviders: directive.viewProviders,
     queries: directive.queries,
     viewQueries: directive.viewQueries,
-    entryComponents: directive.entryComponents,
-    template: template
+    entryComponents: directive.entryComponents, template,
   });
 }
diff --git a/modules/@angular/core/src/application_module.ts b/modules/@angular/core/src/application_module.ts
index 123b716043e4..507e105b04fb 100644
--- a/modules/@angular/core/src/application_module.ts
+++ b/modules/@angular/core/src/application_module.ts
@@ -14,7 +14,6 @@ import {LOCALE_ID} from './i18n/tokens';
 import {Compiler} from './linker/compiler';
 import {ViewUtils} from './linker/view_utils';
 import {NgModule} from './metadata';
-import {Type} from './type';
 
 export function _iterableDiffersFactory() {
   return defaultIterableDiffers;
diff --git a/modules/@angular/core/src/application_ref.ts b/modules/@angular/core/src/application_ref.ts
index c1ac48631db2..8a62db492819 100644
--- a/modules/@angular/core/src/application_ref.ts
+++ b/modules/@angular/core/src/application_ref.ts
@@ -9,7 +9,7 @@
 import {ErrorHandler} from '../src/error_handler';
 import {ListWrapper} from '../src/facade/collection';
 import {unimplemented} from '../src/facade/errors';
-import {isBlank, isPresent, stringify} from '../src/facade/lang';
+import {stringify} from '../src/facade/lang';
 import {isPromise} from '../src/util/lang';
 
 import {ApplicationInitStatus} from './application_init';
@@ -26,9 +26,9 @@ import {Testability, TestabilityRegistry} from './testability/testability';
 import {Type} from './type';
 import {NgZone} from './zone/ng_zone';
 
-var _devMode: boolean = true;
-var _runModeLocked: boolean = false;
-var _platform: PlatformRef;
+let _devMode: boolean = true;
+let _runModeLocked: boolean = false;
+let _platform: PlatformRef;
 
 /**
  * Disable Angular's development mode, which turns off assertions and other
@@ -67,13 +67,13 @@ export function isDevMode(): boolean {
  * @experimental APIs related to application bootstrap are currently under review.
  */
 export function createPlatform(injector: Injector): PlatformRef {
-  if (isPresent(_platform) && !_platform.destroyed) {
+  if (_platform && !_platform.destroyed) {
     throw new Error(
         'There can be only one platform. Destroy the previous one to create a new one.');
   }
   _platform = injector.get(PlatformRef);
   const inits: Function[] = <Function[]>injector.get(PLATFORM_INITIALIZER, null);
-  if (isPresent(inits)) inits.forEach(init => init());
+  if (inits) inits.forEach(init => init());
   return _platform;
 }
 
@@ -107,14 +107,17 @@ export function createPlatformFactory(
  * @experimental APIs related to application bootstrap are currently under review.
  */
 export function assertPlatform(requiredToken: any): PlatformRef {
-  var platform = getPlatform();
-  if (isBlank(platform)) {
+  const platform = getPlatform();
+
+  if (!platform) {
     throw new Error('No platform exists!');
   }
-  if (isPresent(platform) && isBlank(platform.injector.get(requiredToken, null))) {
+
+  if (!platform.injector.get(requiredToken, null)) {
     throw new Error(
         'A platform with a different configuration has been created. Please destroy it first.');
   }
+
   return platform;
 }
 
@@ -124,7 +127,7 @@ export function assertPlatform(requiredToken: any): PlatformRef {
  * @experimental APIs related to application bootstrap are currently under review.
  */
 export function destroyPlatform(): void {
-  if (isPresent(_platform) && !_platform.destroyed) {
+  if (_platform && !_platform.destroyed) {
     _platform.destroy();
   }
 }
@@ -135,7 +138,7 @@ export function destroyPlatform(): void {
  * @experimental APIs related to application bootstrap are currently under review.
  */
 export function getPlatform(): PlatformRef {
-  return isPresent(_platform) && !_platform.destroyed ? _platform : null;
+  return _platform && !_platform.destroyed ? _platform : null;
 }
 
 /**
@@ -224,9 +227,9 @@ function _callAndReportToErrorHandler(errorHandler: ErrorHandler, callback: () =
         // rethrow as the exception handler might not do it
         throw e;
       });
-    } else {
-      return result;
     }
+
+    return result;
   } catch (e) {
     errorHandler.handleError(e);
     // rethrow as the exception handler might not do it
@@ -238,7 +241,6 @@ function _callAndReportToErrorHandler(errorHandler: ErrorHandler, callback: () =
 export class PlatformRef_ extends PlatformRef {
   private _modules: NgModuleRef<any>[] = [];
   private _destroyListeners: Function[] = [];
-
   private _destroyed: boolean = false;
 
   constructor(private _injector: Injector) { super(); }
@@ -253,8 +255,8 @@ export class PlatformRef_ extends PlatformRef {
     if (this._destroyed) {
       throw new Error('The platform has already been destroyed!');
     }
-    ListWrapper.clone(this._modules).forEach((app) => app.destroy());
-    this._destroyListeners.forEach((dispose) => dispose());
+    this._modules.slice().forEach(module => module.destroy());
+    this._destroyListeners.forEach(listener => listener());
     this._destroyed = true;
   }
 
@@ -301,7 +303,7 @@ export class PlatformRef_ extends PlatformRef {
       componentFactoryCallback?: any): Promise<NgModuleRef<M>> {
     const compilerFactory: CompilerFactory = this.injector.get(CompilerFactory);
     const compiler = compilerFactory.createCompiler(
-        compilerOptions instanceof Array ? compilerOptions : [compilerOptions]);
+        Array.isArray(compilerOptions) ? compilerOptions : [compilerOptions]);
 
     // ugly internal api hack: generate host component factories for all declared components and
     // pass the factories into the callback - this is used by UpdateAdapter to get hold of all
@@ -424,10 +426,10 @@ export class ApplicationRef_ extends ApplicationRef {
       componentFactory = this._componentFactoryResolver.resolveComponentFactory(componentOrFactory);
     }
     this._rootComponentTypes.push(componentFactory.componentType);
-    var compRef = componentFactory.create(this._injector, [], componentFactory.selector);
+    const compRef = componentFactory.create(this._injector, [], componentFactory.selector);
     compRef.onDestroy(() => { this._unloadComponent(compRef); });
-    var testability = compRef.injector.get(Testability, null);
-    if (isPresent(testability)) {
+    const testability = compRef.injector.get(Testability, null);
+    if (testability) {
       compRef.injector.get(TestabilityRegistry)
           .registerApplication(compRef.location.nativeElement, testability);
     }
@@ -454,7 +456,7 @@ export class ApplicationRef_ extends ApplicationRef {
 
   /** @internal */
   _unloadComponent(componentRef: ComponentRef<any>): void {
-    if (!ListWrapper.contains(this._rootComponents, componentRef)) {
+    if (this._rootComponents.indexOf(componentRef) == -1) {
       return;
     }
     this.unregisterChangeDetector(componentRef.changeDetectorRef);
@@ -466,7 +468,7 @@ export class ApplicationRef_ extends ApplicationRef {
       throw new Error('ApplicationRef.tick is called recursively');
     }
 
-    var s = ApplicationRef_._tickScope();
+    const scope = ApplicationRef_._tickScope();
     try {
       this._runningTick = true;
       this._changeDetectorRefs.forEach((detector) => detector.detectChanges());
@@ -475,13 +477,13 @@ export class ApplicationRef_ extends ApplicationRef {
       }
     } finally {
       this._runningTick = false;
-      wtfLeave(s);
+      wtfLeave(scope);
     }
   }
 
   ngOnDestroy() {
     // TODO(alxhub): Dispose of the NgZone.
-    ListWrapper.clone(this._rootComponents).forEach((ref) => ref.destroy());
+    this._rootComponents.slice().forEach((component) => component.destroy());
   }
 
   get componentTypes(): Type<any>[] { return this._rootComponentTypes; }
diff --git a/modules/@angular/core/src/application_tokens.ts b/modules/@angular/core/src/application_tokens.ts
index 8b8a0f5ac9fc..12a7be59ce3b 100644
--- a/modules/@angular/core/src/application_tokens.ts
+++ b/modules/@angular/core/src/application_tokens.ts
@@ -34,7 +34,7 @@ export function _appIdRandomProviderFactory() {
 export const APP_ID_RANDOM_PROVIDER = {
   provide: APP_ID,
   useFactory: _appIdRandomProviderFactory,
-  deps: <any[]>[]
+  deps: <any[]>[],
 };
 
 function _randomChar(): string {
diff --git a/modules/@angular/core/src/linker/view_utils.ts b/modules/@angular/core/src/linker/view_utils.ts
index 520039ab061b..c10b575a5ad4 100644
--- a/modules/@angular/core/src/linker/view_utils.ts
+++ b/modules/@angular/core/src/linker/view_utils.ts
@@ -10,7 +10,6 @@ import {APP_ID} from '../application_tokens';
 import {devModeEqual} from '../change_detection/change_detection';
 import {UNINITIALIZED} from '../change_detection/change_detection_util';
 import {Inject, Injectable} from '../di';
-import {ListWrapper} from '../facade/collection';
 import {isBlank, isPresent, looseIdentical} from '../facade/lang';
 import {ViewEncapsulation} from '../metadata/view';
 import {RenderComponentType, Renderer, RootRenderer} from '../render/api';
diff --git a/modules/@angular/core/src/metadata.ts b/modules/@angular/core/src/metadata.ts
index f8c4ca9a2abe..e606c12fa4a3 100644
--- a/modules/@angular/core/src/metadata.ts
+++ b/modules/@angular/core/src/metadata.ts
@@ -15,8 +15,6 @@ import {Attribute, ContentChild, ContentChildren, Query, ViewChild, ViewChildren
 import {Component, Directive, HostBinding, HostListener, Input, Output, Pipe} from './metadata/directives';
 import {ModuleWithProviders, NgModule, SchemaMetadata} from './metadata/ng_module';
 import {ViewEncapsulation} from './metadata/view';
-import {Type} from './type';
-import {TypeDecorator, makeParamDecorator, makePropDecorator} from './util/decorators';
 
 export {ANALYZE_FOR_ENTRY_COMPONENTS, Attribute, ContentChild, ContentChildDecorator, ContentChildren, ContentChildrenDecorator, Query, ViewChild, ViewChildDecorator, ViewChildren, ViewChildrenDecorator} from './metadata/di';
 export {Component, ComponentDecorator, Directive, DirectiveDecorator, HostBinding, HostListener, Input, Output, Pipe} from './metadata/directives';
diff --git a/modules/@angular/core/src/metadata/view.ts b/modules/@angular/core/src/metadata/view.ts
index f917112eac39..c1e28b8ddd52 100644
--- a/modules/@angular/core/src/metadata/view.ts
+++ b/modules/@angular/core/src/metadata/view.ts
@@ -7,8 +7,6 @@
  */
 
 import {AnimationEntryMetadata} from '../animation/metadata';
-import {Type} from '../type';
-
 
 /**
  * Defines template and style encapsulation options available for Component's {@link Component}.
@@ -46,13 +44,6 @@ export var VIEW_ENCAPSULATION_VALUES =
 /**
  * Metadata properties available for configuring Views.
  *
- * Each Angular component requires a single `@Component` and at least one `@View` annotation. The
- * `@View` annotation specifies the HTML template to use, and lists the directives that are active
- * within the template.
- *
- * When a component is instantiated, the template is loaded into the component's shadow root, and
- * the expressions and statements in the template are evaluated against the component.
- *
  * For details on the `@Component` annotation, see {@link Component}.
  *
  * ### Example
@@ -61,7 +52,6 @@ export var VIEW_ENCAPSULATION_VALUES =
  * @Component({
  *   selector: 'greet',
  *   template: 'Hello {{name}}!',
- *   directives: [GreetUser, Bold]
  * })
  * class Greet {
  *   name: string;
@@ -73,46 +63,23 @@ export var VIEW_ENCAPSULATION_VALUES =
  * ```
  *
  * @deprecated Use Component instead.
+ *
+ * {@link Component}
  */
 export class ViewMetadata {
-  /**
-   * Specifies a template URL for an Angular component.
-   *
-   * NOTE: Only one of `templateUrl` or `template` can be defined per View.
-   *
-   * <!-- TODO: what's the url relative to? -->
-   */
+  /** {@link Component.templateUrl} */
   templateUrl: string;
-
-  /**
-   * Specifies an inline template for an Angular component.
-   *
-   * NOTE: Only one of `templateUrl` or `template` can be defined per View.
-   */
+  /** {@link Component.template} */
   template: string;
-
-  /**
-   * Specifies stylesheet URLs for an Angular component.
-   *
-   * <!-- TODO: what's the url relative to? -->
-   */
+  /** {@link Component.stylesUrl} */
   styleUrls: string[];
-
-  /**
-   * Specifies an inline stylesheet for an Angular component.
-   */
+  /** {@link Component.styles} */
   styles: string[];
-
-  /**
-   * Specify how the template and the styles should be encapsulated.
-   * The default is {@link ViewEncapsulation#Emulated `ViewEncapsulation.Emulated`} if the view
-   * has styles,
-   * otherwise {@link ViewEncapsulation#None `ViewEncapsulation.None`}.
-   */
+  /** {@link Component.encapsulation} */
   encapsulation: ViewEncapsulation;
-
+  /** {@link Component.animation} */
   animations: AnimationEntryMetadata[];
-
+  /** {@link Component.interpolation} */
   interpolation: [string, string];
 
   constructor(
diff --git a/modules/@angular/core/src/platform_core_providers.ts b/modules/@angular/core/src/platform_core_providers.ts
index 5b977201c775..e5a71a01543d 100644
--- a/modules/@angular/core/src/platform_core_providers.ts
+++ b/modules/@angular/core/src/platform_core_providers.ts
@@ -8,7 +8,7 @@
 
 import {PlatformRef, PlatformRef_, createPlatformFactory} from './application_ref';
 import {Console} from './console';
-import {ClassProvider, ExistingProvider, FactoryProvider, Provider, TypeProvider, ValueProvider} from './di';
+import {Provider} from './di';
 import {Reflector, reflector} from './reflection/reflection';
 import {ReflectorReader} from './reflection/reflector_reader';
 import {TestabilityRegistry} from './testability/testability';
@@ -18,9 +18,12 @@ function _reflector(): Reflector {
 }
 
 const _CORE_PLATFORM_PROVIDERS: Provider[] = [
-  PlatformRef_, {provide: PlatformRef, useExisting: PlatformRef_},
+  PlatformRef_,
+  {provide: PlatformRef, useExisting: PlatformRef_},
   {provide: Reflector, useFactory: _reflector, deps: []},
-  {provide: ReflectorReader, useExisting: Reflector}, TestabilityRegistry, Console
+  {provide: ReflectorReader, useExisting: Reflector},
+  TestabilityRegistry,
+  Console,
 ];
 
 /**
diff --git a/modules/@angular/core/src/type.ts b/modules/@angular/core/src/type.ts
index 2ea9323a050b..21e6e29fad52 100644
--- a/modules/@angular/core/src/type.ts
+++ b/modules/@angular/core/src/type.ts
@@ -16,7 +16,7 @@
  *
  * @stable
  */
-export var Type = Function;
+export const Type = Function;
 
 
 export interface Type<T> extends Function { new (...args: any[]): T; }
diff --git a/tools/public_api_guard/core/index.d.ts b/tools/public_api_guard/core/index.d.ts
index d798eb2daf05..49f6ed19fcad 100644
--- a/tools/public_api_guard/core/index.d.ts
+++ b/tools/public_api_guard/core/index.d.ts
@@ -916,7 +916,7 @@ export declare const TRANSLATIONS_FORMAT: OpaqueToken;
 export declare function trigger(name: string, animation: AnimationMetadata[]): AnimationEntryMetadata;
 
 /** @stable */
-export declare var Type: FunctionConstructor;
+export declare const Type: FunctionConstructor;
 
 /** @stable */
 export interface TypeDecorator {

From 98fac36706530c2251bd0c63aa9ac0a3deaf46bb Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Tue, 20 Sep 2016 14:21:06 -0700
Subject: [PATCH 13/70] docs(Component): API docs for .encapsulation and
 .interpolation

---
 .../@angular/core/src/metadata/directives.ts  | 31 +++++++++++++------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/modules/@angular/core/src/metadata/directives.ts b/modules/@angular/core/src/metadata/directives.ts
index 38baf9295842..7a1cf43becd8 100644
--- a/modules/@angular/core/src/metadata/directives.ts
+++ b/modules/@angular/core/src/metadata/directives.ts
@@ -448,15 +448,15 @@ export interface ComponentDecorator {
    * * **changeDetection** - change detection strategy used by this component
    * * **encapsulation** - style encapsulation strategy used by this component
    * * **entryComponents** - list of components that are dynamically inserted into the view of this
-   * component
+   *   component
    * * **exportAs** - name under which the component instance is exported in a template
    * * **host** - map of class property to host element bindings for events, properties and
-   * attributes
+   *   attributes
    * * **inputs** - list of class property names to data-bind as component inputs
    * * **interpolation** - custom interpolation markers used in this component's template
    * * **moduleId** - ES/CommonJS module id of the file in which this component is defined
    * * **outputs** - list of class property names that expose output events that others can
-   * subscribe to
+   *   subscribe to
    * * **providers** - list of providers available to this component and its children
    * * **queries** -  configure queries that can be injected into the component
    * * **selector** - css selector that identifies this component in a template
@@ -655,20 +655,33 @@ export interface Component extends Directive {
   animations?: AnimationEntryMetadata[];
 
   /**
-   * Specify how the template and the styles should be encapsulated.
-   * The default is {@link ViewEncapsulation#Emulated `ViewEncapsulation.Emulated`} if the view
-   * has styles,
-   * otherwise {@link ViewEncapsulation#None `ViewEncapsulation.None`}.
+   * Specifies how the template and the styles should be encapsulated:
+   * - {@link ViewEncapsulation#Native `ViewEncapsulation.Native`} to use shadow roots - only works
+   *   if natively available on the platform,
+   * - {@link ViewEncapsulation#Emulated `ViewEncapsulation.Emulated`} to use shimmed CSS that
+   *   emulates the native behavior,
+   * - {@link ViewEncapsulation#None `ViewEncapsulation.None`} to use global CSS without any
+   *   encapsulation.
+   *
+   * When no `encapsulation` is defined for the component, the default value from the
+   * {@link CompilerConfig} is used. The default is `ViewEncapsulation.Emulated`}. Provide a new
+   * `CompilerConfig` to override this value.
+   *
+   * If the encapsulation is set to `ViewEncapsulation.Emulated` and the component has no `styles`
+   * nor `styleUrls` the encapsulation will automatically be switched to `ViewEncapsulation.None`.
    */
   encapsulation?: ViewEncapsulation;
 
+  /**
+   * Overrides the default encapsulation start and end delimiters (respectively `{{` and `}}`)
+   */
   interpolation?: [string, string];
 
   /**
    * Defines the components that should be compiled as well when
    * this component is defined. For each components listed here,
-   * Angular will create a {@link ComponentFactory ComponentFactory} and store it in the
-   * {@link ComponentFactoryResolver ComponentFactoryResolver}.
+   * Angular will create a {@link ComponentFactory} and store it in the
+   * {@link ComponentFactoryResolver}.
    */
   entryComponents?: Array<Type<any>|any[]>;
 }

From b81e2e7a31829de3ea0dc56dcb1243425700464e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mi=C5=A1ko=20Hevery?= <misko@hevery.com>
Date: Fri, 23 Sep 2016 10:47:16 -0700
Subject: [PATCH 14/70] fix(upgrade): allow attribute selectors for components
 in ng2 which are not part of upgrade (#11808)

fixes #11280
---
 .../@angular/upgrade/src/upgrade_adapter.ts   |  9 ++++---
 modules/@angular/upgrade/test/upgrade_spec.ts | 27 ++++++++++++++++++-
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/modules/@angular/upgrade/src/upgrade_adapter.ts b/modules/@angular/upgrade/src/upgrade_adapter.ts
index 14566492b254..0126d0f068b1 100644
--- a/modules/@angular/upgrade/src/upgrade_adapter.ts
+++ b/modules/@angular/upgrade/src/upgrade_adapter.ts
@@ -401,9 +401,12 @@ export class UpgradeAdapter {
                     ._bootstrapModuleWithZone(
                         DynamicNgUpgradeModule, undefined, ngZone,
                         (componentFactories: ComponentFactory<any>[]) => {
-                          componentFactories.forEach((componentFactory) => {
-                            componentFactoryRefMap[getComponentInfo(componentFactory.componentType)
-                                                       .selector] = componentFactory;
+                          componentFactories.forEach((componentFactory: ComponentFactory<any>) => {
+                            var type: Type<any> = componentFactory.componentType;
+                            if (this.upgradedComponents.indexOf(type) !== -1) {
+                              componentFactoryRefMap[getComponentInfo(type).selector] =
+                                  componentFactory;
+                            }
                           });
                         })
                     .then((ref: NgModuleRef<any>) => {
diff --git a/modules/@angular/upgrade/test/upgrade_spec.ts b/modules/@angular/upgrade/test/upgrade_spec.ts
index 91cdf7706f10..8aaf51a6fd04 100644
--- a/modules/@angular/upgrade/test/upgrade_spec.ts
+++ b/modules/@angular/upgrade/test/upgrade_spec.ts
@@ -964,6 +964,31 @@ export function main() {
          }));
     });
 
+    it('should allow attribute selectors for components in ng2', async(() => {
+         const adapter: UpgradeAdapter = new UpgradeAdapter(forwardRef(() => MyNg2Module));
+         var ng1Module = angular.module('myExample', []);
+
+         @Component({selector: '[works]', template: 'works!'})
+         class WorksComponent {
+         }
+
+         @Component({selector: 'root-component', template: 'It <div works></div>'})
+         class RootComponent {
+         }
+
+         @NgModule({imports: [BrowserModule], declarations: [RootComponent, WorksComponent]})
+         class MyNg2Module {
+         }
+
+         ng1Module.directive('rootComponent', adapter.downgradeNg2Component(RootComponent));
+
+         document.body.innerHTML = '<root-component></root-component>';
+         adapter.bootstrap(document.body.firstElementChild, ['myExample']).ready((ref) => {
+           expect(multiTrim(document.body.textContent)).toEqual('It works!');
+           ref.dispose();
+         });
+       }));
+
     describe('examples', () => {
       it('should verify UpgradeAdapter example', async(() => {
            const adapter: UpgradeAdapter = new UpgradeAdapter(forwardRef(() => Ng2Module));
@@ -994,7 +1019,7 @@ export function main() {
 
            document.body.innerHTML = '<ng2 name="World">project</ng2>';
 
-           adapter.bootstrap(document.body, ['myExample']).ready((ref) => {
+           adapter.bootstrap(document.body.firstElementChild, ['myExample']).ready((ref) => {
              expect(multiTrim(document.body.textContent))
                  .toEqual('ng2[ng1[Hello World!](transclude)](project)');
              ref.dispose();

From 16601f935985362056a237fcbd6890da078e2d76 Mon Sep 17 00:00:00 2001
From: Igor Minar <igor@angularjs.org>
Date: Fri, 23 Sep 2016 10:50:42 -0700
Subject: [PATCH 15/70] docs(changelog): add changelog for 2.0.1

---
 CHANGELOG.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f864ee961570..32b42b46a148 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,22 @@
+<a name="2.0.1"></a>
+## [2.0.1](https://github.com/angular/angular/compare/2.0.0...2.0.1) (2016-09-23)
+
+
+### Bug Fixes
+
+* **common:** fix ngOnChanges signature of NgTemplateOutlet directive ([14ee759](https://github.com/angular/angular/commit/14ee759))
+* **compiler:** `[attribute~=value]` selector ([#11696](https://github.com/angular/angular/issues/11696)) ([734b8b8](https://github.com/angular/angular/commit/734b8b8)), closes [#9644](https://github.com/angular/angular/issues/9644)
+* **compiler:** safe property access expressions work in event bindings ([#11724](https://github.com/angular/angular/issues/11724)) ([a95d652](https://github.com/angular/angular/commit/a95d652))
+* **compiler:** throw when Component.moduleId is not a string ([bd4045b](https://github.com/angular/angular/commit/bd4045b)), closes [#11590](https://github.com/angular/angular/issues/11590)
+* **compiler:** do not provide I18N values when they're not specified ([03aedbe](https://github.com/angular/angular/commit/03aedbe)), closes [#11643](https://github.com/angular/angular/issues/11643)
+* **core:** ContentChild descendants should be queried by default ([0dc15eb](https://github.com/angular/angular/commit/0dc15eb)), closes [#1645](https://github.com/angular/angular/issues/1645)
+* **forms:** disable all radios with disable() ([2860418](https://github.com/angular/angular/commit/2860418))
+* **forms:** make setDisabledState optional for reactive form directives ([#11731](https://github.com/angular/angular/issues/11731)) ([51d73d3](https://github.com/angular/angular/commit/51d73d3)), closes [#11719](https://github.com/angular/angular/issues/11719)
+* **forms:** support unbound disabled in ngModel ([#11736](https://github.com/angular/angular/issues/11736)) ([39e251e](https://github.com/angular/angular/commit/39e251e))
+* **upgrade:** allow attribute selectors for components in ng2 which are not part of upgrade ([#11808](https://github.com/angular/angular/issues/11808)) ([b81e2e7](https://github.com/angular/angular/commit/b81e2e7)), closes [#11280](https://github.com/angular/angular/issues/11280)
+
+
+
 <a name="2.0.0"></a>
 # [2.0.0](https://github.com/angular/angular/compare/2.0.0-rc.7...2.0.0) (2016-09-14)
 

From 712d1a7c37b5dcd2878f814e64cfe44744f30f28 Mon Sep 17 00:00:00 2001
From: Igor Minar <igor@angularjs.org>
Date: Fri, 23 Sep 2016 11:28:36 -0700
Subject: [PATCH 16/70] chore(release): v2.0.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2a2caab06a9a..188dc609a8b8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-srcs",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "private": true,
   "branchPattern": "2.0.*",
   "description": "Angular 2 - a web framework for modern web apps",

From cf750e17edc89e0d93641ab53a1f6cdaeffa50ec Mon Sep 17 00:00:00 2001
From: Victor Savkin <vic.savkin@gmail.com>
Date: Fri, 23 Sep 2016 15:14:06 -0700
Subject: [PATCH 17/70] fix(router): do not reset the router state when
 updating the component (#11867)

---
 modules/@angular/router/src/router.ts       | 11 +++++++++++
 modules/@angular/router/test/router.spec.ts | 20 +++++++++++++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/modules/@angular/router/src/router.ts b/modules/@angular/router/src/router.ts
index faeec8b13673..f5da74f61315 100644
--- a/modules/@angular/router/src/router.ts
+++ b/modules/@angular/router/src/router.ts
@@ -317,6 +317,17 @@ export class Router {
     this.currentRouterState = createEmptyState(this.currentUrlTree, this.rootComponentType);
   }
 
+  /**
+   * @internal
+   * TODO: this should be removed once the constructor of the router made internal
+   */
+  resetRootComponentType(rootComponentType: Type<any>): void {
+    this.rootComponentType = rootComponentType;
+    // TODO: vsavkin router 4.0 should make the root component set to null
+    // this will simplify the lifecycle of the router.
+    this.currentRouterState.root.component = this.rootComponentType;
+  }
+
   /**
    * Sets up the location change listener and performs the initial navigation.
    */
diff --git a/modules/@angular/router/test/router.spec.ts b/modules/@angular/router/test/router.spec.ts
index 42ea05b27b3a..007e6c9b7a2c 100644
--- a/modules/@angular/router/test/router.spec.ts
+++ b/modules/@angular/router/test/router.spec.ts
@@ -6,13 +6,31 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {PreActivation} from '../src/router';
+import {TestBed} from '@angular/core/testing';
+
+import {PreActivation, Router} from '../src/router';
 import {RouterOutletMap} from '../src/router_outlet_map';
 import {ActivatedRouteSnapshot, InheritedResolve, RouterStateSnapshot, createEmptyStateSnapshot} from '../src/router_state';
 import {DefaultUrlSerializer} from '../src/url_tree';
 import {TreeNode} from '../src/utils/tree';
+import {RouterTestingModule} from '../testing/router_testing_module';
 
 describe('Router', () => {
+  describe('resetRootComponentType', () => {
+    class NewRootComponent {}
+
+    beforeEach(() => { TestBed.configureTestingModule({imports: [RouterTestingModule]}); });
+
+    it('should not change root route when updating the root component', () => {
+      const r: Router = TestBed.get(Router);
+      const root = r.routerState.root;
+
+      r.resetRootComponentType(NewRootComponent);
+
+      expect(r.routerState.root).toBe(root);
+    });
+  });
+
   describe('PreActivation', () => {
     const serializer = new DefaultUrlSerializer();
     const inj = {get: (token: any) => () => `${token}_value`};

From 85489a166e6b9b6bf5bee17e411beda9f8f5dad7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matias=20Niemel=C3=A4?= <matias@yearofmoo.com>
Date: Fri, 23 Sep 2016 16:37:04 -0400
Subject: [PATCH 18/70] refactor(animations): ensure animation input/outputs
 are managed within the template parser (#11782)

Closes #11782
Closes #11601
Related #11707
---
 .../src/animation/animation_compiler.ts       | 174 ++----------------
 .../src/animation/animation_parser.ts         | 102 +++++-----
 modules/@angular/compiler/src/identifiers.ts  |   7 +-
 .../@angular/compiler/src/offline_compiler.ts |  14 +-
 .../compiler/src/private_import_core.ts       |   2 -
 .../compiler/src/provider_analyzer.ts         |  16 +-
 .../@angular/compiler/src/runtime_compiler.ts |  14 +-
 .../src/template_parser/template_ast.ts       |  13 +-
 .../src/template_parser/template_parser.ts    | 119 +++++++++---
 modules/@angular/compiler/src/util.ts         |  14 +-
 .../src/view_compiler/compile_view.ts         |   4 +-
 .../src/view_compiler/event_binder.ts         |  39 ++--
 .../src/view_compiler/property_binder.ts      |   2 -
 .../compiler/src/view_compiler/view_binder.ts |  31 +---
 .../src/view_compiler/view_builder.ts         |  10 +-
 .../src/view_compiler/view_compiler.ts        |  22 +--
 .../test/animation/animation_compiler_spec.ts |  21 +--
 .../test/animation/animation_parser_spec.ts   |  10 +-
 .../template_parser/template_parser_spec.ts   |  44 +++--
 .../core/src/animation/animation_output.ts    |  10 -
 .../@angular/core/src/core_private_export.ts  |   3 -
 modules/@angular/core/src/linker/view.ts      |  16 +-
 .../animation/animation_integration_spec.ts   |  35 +++-
 23 files changed, 324 insertions(+), 398 deletions(-)
 delete mode 100644 modules/@angular/core/src/animation/animation_output.ts

diff --git a/modules/@angular/compiler/src/animation/animation_compiler.ts b/modules/@angular/compiler/src/animation/animation_compiler.ts
index f80ac3cc3e41..3399e8e80081 100644
--- a/modules/@angular/compiler/src/animation/animation_compiler.ts
+++ b/modules/@angular/compiler/src/animation/animation_compiler.ts
@@ -6,75 +6,26 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {CompileDirectiveMetadata} from '../compile_metadata';
 import {StringMapWrapper} from '../facade/collection';
 import {isBlank, isPresent} from '../facade/lang';
 import {Identifiers, resolveIdentifier} from '../identifiers';
 import * as o from '../output/output_ast';
-import {ANY_STATE, AnimationOutput, DEFAULT_STATE, EMPTY_STATE} from '../private_import_core';
-import * as t from '../template_parser/template_ast';
+import {ANY_STATE, DEFAULT_STATE, EMPTY_STATE} from '../private_import_core';
 
-import {AnimationAst, AnimationAstVisitor, AnimationEntryAst, AnimationGroupAst, AnimationKeyframeAst, AnimationSequenceAst, AnimationStateAst, AnimationStateDeclarationAst, AnimationStateTransitionAst, AnimationStepAst, AnimationStylesAst} from './animation_ast';
-import {AnimationParseError, ParsedAnimationResult, parseAnimationEntry, parseAnimationOutputName} from './animation_parser';
+import {AnimationAst, AnimationAstVisitor, AnimationEntryAst, AnimationGroupAst, AnimationKeyframeAst, AnimationSequenceAst, AnimationStateDeclarationAst, AnimationStateTransitionAst, AnimationStepAst, AnimationStylesAst} from './animation_ast';
 
-const animationCompilationCache =
-    new Map<CompileDirectiveMetadata, CompiledAnimationTriggerResult[]>();
-
-export class CompiledAnimationTriggerResult {
-  constructor(
-      public name: string, public statesMapStatement: o.Statement,
-      public statesVariableName: string, public fnStatement: o.Statement,
-      public fnVariable: o.Expression) {}
-}
-
-export class CompiledComponentAnimationResult {
-  constructor(
-      public outputs: AnimationOutput[], public triggers: CompiledAnimationTriggerResult[]) {}
+export class AnimationEntryCompileResult {
+  constructor(public name: string, public statements: o.Statement[], public fnExp: o.Expression) {}
 }
 
 export class AnimationCompiler {
-  compileComponent(component: CompileDirectiveMetadata, template: t.TemplateAst[]):
-      CompiledComponentAnimationResult {
-    var compiledAnimations: CompiledAnimationTriggerResult[] = [];
-    var groupedErrors: string[] = [];
-    var triggerLookup: {[key: string]: CompiledAnimationTriggerResult} = {};
-    var componentName = component.type.name;
-
-    component.template.animations.forEach(entry => {
-      var result = parseAnimationEntry(entry);
-      var triggerName = entry.name;
-      if (result.errors.length > 0) {
-        var errorMessage =
-            `Unable to parse the animation sequence for "${triggerName}" due to the following errors:`;
-        result.errors.forEach(
-            (error: AnimationParseError) => { errorMessage += '\n-- ' + error.msg; });
-        groupedErrors.push(errorMessage);
-      }
-
-      if (triggerLookup[triggerName]) {
-        groupedErrors.push(
-            `The animation trigger "${triggerName}" has already been registered on "${componentName}"`);
-      } else {
-        var factoryName = `${componentName}_${entry.name}`;
-        var visitor = new _AnimationBuilder(triggerName, factoryName);
-        var compileResult = visitor.build(result.ast);
-        compiledAnimations.push(compileResult);
-        triggerLookup[entry.name] = compileResult;
-      }
+  compile(factoryNamePrefix: string, parsedAnimations: AnimationEntryAst[]):
+      AnimationEntryCompileResult[] {
+    return parsedAnimations.map(entry => {
+      const factoryName = `${factoryNamePrefix}_${entry.name}`;
+      const visitor = new _AnimationBuilder(entry.name, factoryName);
+      return visitor.build(entry);
     });
-
-    var validatedProperties = _validateAnimationProperties(compiledAnimations, template);
-    validatedProperties.errors.forEach(error => { groupedErrors.push(error.msg); });
-
-    if (groupedErrors.length > 0) {
-      var errorMessageStr =
-          `Animation parsing for ${component.type.name} has failed due to the following errors:`;
-      groupedErrors.forEach(error => errorMessageStr += `\n- ${error}`);
-      throw new Error(errorMessageStr);
-    }
-
-    animationCompilationCache.set(component, compiledAnimations);
-    return new CompiledComponentAnimationResult(validatedProperties.outputs, compiledAnimations);
   }
 }
 
@@ -334,7 +285,7 @@ class _AnimationBuilder implements AnimationAstVisitor {
         statements);
   }
 
-  build(ast: AnimationAst): CompiledAnimationTriggerResult {
+  build(ast: AnimationAst): AnimationEntryCompileResult {
     var context = new _AnimationBuilderContext();
     var fnStatement = ast.visit(this, context).toDeclStmt(this._fnVarName);
     var fnVariable = o.variable(this._fnVarName);
@@ -353,9 +304,10 @@ class _AnimationBuilder implements AnimationAstVisitor {
           lookupMap.push([stateName, variableValue]);
         });
 
-    var compiledStatesMapExpr = this._statesMapVar.set(o.literalMap(lookupMap)).toDeclStmt();
-    return new CompiledAnimationTriggerResult(
-        this.animationName, compiledStatesMapExpr, this._statesMapVarName, fnStatement, fnVariable);
+    const compiledStatesMapStmt = this._statesMapVar.set(o.literalMap(lookupMap)).toDeclStmt();
+    const statements: o.Statement[] = [compiledStatesMapStmt, fnStatement];
+
+    return new AnimationEntryCompileResult(this.animationName, statements, fnVariable);
   }
 }
 
@@ -405,99 +357,3 @@ function _isEndStateAnimateStep(step: AnimationAst): boolean {
 function _getStylesArray(obj: any): {[key: string]: any}[] {
   return obj.styles.styles;
 }
-
-function _validateAnimationProperties(
-    compiledAnimations: CompiledAnimationTriggerResult[],
-    template: t.TemplateAst[]): AnimationPropertyValidationOutput {
-  var visitor = new _AnimationTemplatePropertyVisitor(compiledAnimations);
-  t.templateVisitAll(visitor, template);
-  return new AnimationPropertyValidationOutput(visitor.outputs, visitor.errors);
-}
-
-export class AnimationPropertyValidationOutput {
-  constructor(public outputs: AnimationOutput[], public errors: AnimationParseError[]) {}
-}
-
-class _AnimationTemplatePropertyVisitor implements t.TemplateAstVisitor {
-  private _animationRegistry: {[key: string]: boolean};
-  public errors: AnimationParseError[] = [];
-  public outputs: AnimationOutput[] = [];
-
-  constructor(animations: CompiledAnimationTriggerResult[]) {
-    this._animationRegistry = this._buildCompileAnimationLookup(animations);
-  }
-
-  private _buildCompileAnimationLookup(animations: CompiledAnimationTriggerResult[]):
-      {[key: string]: boolean} {
-    var map: {[key: string]: boolean} = {};
-    animations.forEach(entry => { map[entry.name] = true; });
-    return map;
-  }
-
-  private _validateAnimationInputOutputPairs(
-      inputAsts: t.BoundElementPropertyAst[], outputAsts: t.BoundEventAst[],
-      animationRegistry: {[key: string]: any}, isHostLevel: boolean): void {
-    var detectedAnimationInputs: {[key: string]: boolean} = {};
-    inputAsts.forEach(input => {
-      if (input.type == t.PropertyBindingType.Animation) {
-        var triggerName = input.name;
-        if (isPresent(animationRegistry[triggerName])) {
-          detectedAnimationInputs[triggerName] = true;
-        } else {
-          this.errors.push(
-              new AnimationParseError(`Couldn't find an animation entry for ${triggerName}`));
-        }
-      }
-    });
-
-    outputAsts.forEach(output => {
-      if (output.name[0] == '@') {
-        var normalizedOutputData = parseAnimationOutputName(output.name.substr(1), this.errors);
-        let triggerName = normalizedOutputData.name;
-        let triggerEventPhase = normalizedOutputData.phase;
-        if (!animationRegistry[triggerName]) {
-          this.errors.push(new AnimationParseError(
-              `Couldn't find the corresponding ${isHostLevel ? 'host-level ' : '' }animation trigger definition for (@${triggerName})`));
-        } else if (!detectedAnimationInputs[triggerName]) {
-          this.errors.push(new AnimationParseError(
-              `Unable to listen on (@${triggerName}.${triggerEventPhase}) because the animation trigger [@${triggerName}] isn't being used on the same element`));
-        } else {
-          this.outputs.push(normalizedOutputData);
-        }
-      }
-    });
-  }
-
-  visitElement(ast: t.ElementAst, ctx: any): any {
-    this._validateAnimationInputOutputPairs(
-        ast.inputs, ast.outputs, this._animationRegistry, false);
-
-    var componentOnElement: t.DirectiveAst =
-        ast.directives.find(directive => directive.directive.isComponent);
-    if (componentOnElement) {
-      let cachedComponentAnimations = animationCompilationCache.get(componentOnElement.directive);
-      if (cachedComponentAnimations) {
-        this._validateAnimationInputOutputPairs(
-            componentOnElement.hostProperties, componentOnElement.hostEvents,
-            this._buildCompileAnimationLookup(cachedComponentAnimations), true);
-      }
-    }
-
-    t.templateVisitAll(this, ast.children);
-  }
-
-  visitEmbeddedTemplate(ast: t.EmbeddedTemplateAst, ctx: any): any {
-    t.templateVisitAll(this, ast.children);
-  }
-
-  visitEvent(ast: t.BoundEventAst, ctx: any): any {}
-  visitBoundText(ast: t.BoundTextAst, ctx: any): any {}
-  visitText(ast: t.TextAst, ctx: any): any {}
-  visitNgContent(ast: t.NgContentAst, ctx: any): any {}
-  visitAttr(ast: t.AttrAst, ctx: any): any {}
-  visitDirective(ast: t.DirectiveAst, ctx: any): any {}
-  visitReference(ast: t.ReferenceAst, ctx: any): any {}
-  visitVariable(ast: t.VariableAst, ctx: any): any {}
-  visitDirectiveProperty(ast: t.BoundDirectivePropertyAst, ctx: any): any {}
-  visitElementProperty(ast: t.BoundElementPropertyAst, ctx: any): any {}
-}
diff --git a/modules/@angular/compiler/src/animation/animation_parser.ts b/modules/@angular/compiler/src/animation/animation_parser.ts
index 4870b2804d9d..bf5b7177e3b6 100644
--- a/modules/@angular/compiler/src/animation/animation_parser.ts
+++ b/modules/@angular/compiler/src/animation/animation_parser.ts
@@ -6,13 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {CompileAnimationAnimateMetadata, CompileAnimationEntryMetadata, CompileAnimationGroupMetadata, CompileAnimationKeyframesSequenceMetadata, CompileAnimationMetadata, CompileAnimationSequenceMetadata, CompileAnimationStateDeclarationMetadata, CompileAnimationStateTransitionMetadata, CompileAnimationStyleMetadata, CompileAnimationWithStepsMetadata} from '../compile_metadata';
+import {CompileAnimationAnimateMetadata, CompileAnimationEntryMetadata, CompileAnimationGroupMetadata, CompileAnimationKeyframesSequenceMetadata, CompileAnimationMetadata, CompileAnimationSequenceMetadata, CompileAnimationStateDeclarationMetadata, CompileAnimationStateTransitionMetadata, CompileAnimationStyleMetadata, CompileAnimationWithStepsMetadata, CompileDirectiveMetadata} from '../compile_metadata';
 import {ListWrapper, StringMapWrapper} from '../facade/collection';
 import {isArray, isBlank, isPresent, isString, isStringMap} from '../facade/lang';
 import {Math} from '../facade/math';
 import {ParseError} from '../parse_util';
+import {ANY_STATE, FILL_STYLE_FLAG} from '../private_import_core';
 
-import {ANY_STATE, AnimationOutput, FILL_STYLE_FLAG} from '../private_import_core';
 import {AnimationAst, AnimationEntryAst, AnimationGroupAst, AnimationKeyframeAst, AnimationSequenceAst, AnimationStateDeclarationAst, AnimationStateTransitionAst, AnimationStateTransitionExpression, AnimationStepAst, AnimationStylesAst, AnimationWithStepsAst} from './animation_ast';
 import {StylesCollection} from './styles_collection';
 
@@ -21,62 +21,70 @@ const _TERMINAL_KEYFRAME = 1;
 const _ONE_SECOND = 1000;
 
 export class AnimationParseError extends ParseError {
-  constructor(message: any /** TODO #9100 */) { super(null, message); }
+  constructor(message: string) { super(null, message); }
   toString(): string { return `${this.msg}`; }
 }
 
-export class ParsedAnimationResult {
+export class AnimationEntryParseResult {
   constructor(public ast: AnimationEntryAst, public errors: AnimationParseError[]) {}
 }
 
-export function parseAnimationEntry(entry: CompileAnimationEntryMetadata): ParsedAnimationResult {
-  var errors: AnimationParseError[] = [];
-  var stateStyles: {[key: string]: AnimationStylesAst} = {};
-  var transitions: CompileAnimationStateTransitionMetadata[] = [];
-
-  var stateDeclarationAsts: any[] /** TODO #9100 */ = [];
-  entry.definitions.forEach(def => {
-    if (def instanceof CompileAnimationStateDeclarationMetadata) {
-      _parseAnimationDeclarationStates(def, errors).forEach(ast => {
-        stateDeclarationAsts.push(ast);
-        stateStyles[ast.stateName] = ast.styles;
-      });
-    } else {
-      transitions.push(<CompileAnimationStateTransitionMetadata>def);
+export class AnimationParser {
+  parseComponent(component: CompileDirectiveMetadata): AnimationEntryAst[] {
+    const errors: string[] = [];
+    const componentName = component.type.name;
+    const animationTriggerNames = new Set<string>();
+    const asts = component.template.animations.map(entry => {
+      const result = this.parseEntry(entry);
+      const ast = result.ast;
+      const triggerName = ast.name;
+      if (animationTriggerNames.has(triggerName)) {
+        result.errors.push(new AnimationParseError(
+            `The animation trigger "${triggerName}" has already been registered for the ${componentName} component`));
+      } else {
+        animationTriggerNames.add(triggerName);
+      }
+      if (result.errors.length > 0) {
+        let errorMessage =
+            `- Unable to parse the animation sequence for "${triggerName}" on the ${componentName} component due to the following errors:`;
+        result.errors.forEach(
+            (error: AnimationParseError) => { errorMessage += '\n-- ' + error.msg; });
+        errors.push(errorMessage);
+      }
+      return ast;
+    });
+
+    if (errors.length > 0) {
+      const errorString = errors.join('\n');
+      throw new Error(`Animation parse errors:\n${errorString}`);
     }
-  });
 
-  var stateTransitionAsts =
-      transitions.map(transDef => _parseAnimationStateTransition(transDef, stateStyles, errors));
+    return asts;
+  }
 
-  var ast = new AnimationEntryAst(entry.name, stateDeclarationAsts, stateTransitionAsts);
-  return new ParsedAnimationResult(ast, errors);
-}
+  parseEntry(entry: CompileAnimationEntryMetadata): AnimationEntryParseResult {
+    var errors: AnimationParseError[] = [];
+    var stateStyles: {[key: string]: AnimationStylesAst} = {};
+    var transitions: CompileAnimationStateTransitionMetadata[] = [];
+
+    var stateDeclarationAsts: AnimationStateDeclarationAst[] = [];
+    entry.definitions.forEach(def => {
+      if (def instanceof CompileAnimationStateDeclarationMetadata) {
+        _parseAnimationDeclarationStates(def, errors).forEach(ast => {
+          stateDeclarationAsts.push(ast);
+          stateStyles[ast.stateName] = ast.styles;
+        });
+      } else {
+        transitions.push(<CompileAnimationStateTransitionMetadata>def);
+      }
+    });
 
-export function parseAnimationOutputName(
-    outputName: string, errors: AnimationParseError[]): AnimationOutput {
-  var values = outputName.split('.');
-  var name: string;
-  var phase: string = '';
-  if (values.length > 1) {
-    name = values[0];
-    let parsedPhase = values[1];
-    switch (parsedPhase) {
-      case 'start':
-      case 'done':
-        phase = parsedPhase;
-        break;
-
-      default:
-        errors.push(new AnimationParseError(
-            `The provided animation output phase value "${parsedPhase}" for "@${name}" is not supported (use start or done)`));
-    }
-  } else {
-    name = outputName;
-    errors.push(new AnimationParseError(
-        `The animation trigger output event (@${name}) is missing its phase value name (start or done are currently supported)`));
+    var stateTransitionAsts =
+        transitions.map(transDef => _parseAnimationStateTransition(transDef, stateStyles, errors));
+
+    var ast = new AnimationEntryAst(entry.name, stateDeclarationAsts, stateTransitionAsts);
+    return new AnimationEntryParseResult(ast, errors);
   }
-  return new AnimationOutput(name, phase, outputName);
 }
 
 function _parseAnimationDeclarationStates(
diff --git a/modules/@angular/compiler/src/identifiers.ts b/modules/@angular/compiler/src/identifiers.ts
index a81eeb81c9e2..f1008b45c776 100644
--- a/modules/@angular/compiler/src/identifiers.ts
+++ b/modules/@angular/compiler/src/identifiers.ts
@@ -9,7 +9,7 @@
 import {ANALYZE_FOR_ENTRY_COMPONENTS, ChangeDetectionStrategy, ChangeDetectorRef, ComponentFactory, ComponentFactoryResolver, ElementRef, Injector, LOCALE_ID as LOCALE_ID_, NgModuleFactory, QueryList, RenderComponentType, Renderer, SecurityContext, SimpleChange, TRANSLATIONS_FORMAT as TRANSLATIONS_FORMAT_, TemplateRef, ViewContainerRef, ViewEncapsulation} from '@angular/core';
 
 import {CompileIdentifierMetadata, CompileTokenMetadata} from './compile_metadata';
-import {AnimationGroupPlayer, AnimationKeyframe, AnimationOutput, AnimationSequencePlayer, AnimationStyles, AppElement, AppView, ChangeDetectorStatus, CodegenComponentFactoryResolver, DebugAppView, DebugContext, EMPTY_ARRAY, EMPTY_MAP, NgModuleInjector, NoOpAnimationPlayer, StaticNodeDebugInfo, TemplateRef_, UNINITIALIZED, ValueUnwrapper, ViewType, ViewUtils, balanceAnimationKeyframes, castByValue, checkBinding, clearStyles, collectAndResolveStyles, devModeEqual, flattenNestedViewRenderNodes, interpolate, prepareFinalAnimationStyles, pureProxy1, pureProxy10, pureProxy2, pureProxy3, pureProxy4, pureProxy5, pureProxy6, pureProxy7, pureProxy8, pureProxy9, reflector, registerModuleFactory, renderStyles} from './private_import_core';
+import {AnimationGroupPlayer, AnimationKeyframe, AnimationSequencePlayer, AnimationStyles, AppElement, AppView, ChangeDetectorStatus, CodegenComponentFactoryResolver, DebugAppView, DebugContext, EMPTY_ARRAY, EMPTY_MAP, NgModuleInjector, NoOpAnimationPlayer, StaticNodeDebugInfo, TemplateRef_, UNINITIALIZED, ValueUnwrapper, ViewType, ViewUtils, balanceAnimationKeyframes, castByValue, checkBinding, clearStyles, collectAndResolveStyles, devModeEqual, flattenNestedViewRenderNodes, interpolate, prepareFinalAnimationStyles, pureProxy1, pureProxy10, pureProxy2, pureProxy3, pureProxy4, pureProxy5, pureProxy6, pureProxy7, pureProxy8, pureProxy9, reflector, registerModuleFactory, renderStyles} from './private_import_core';
 import {assetUrl} from './util';
 
 var APP_VIEW_MODULE_URL = assetUrl('core', 'linker/view');
@@ -266,11 +266,6 @@ export class Identifiers {
     moduleUrl: assetUrl('core', 'i18n/tokens'),
     runtime: TRANSLATIONS_FORMAT_
   };
-  static AnimationOutput: IdentifierSpec = {
-    name: 'AnimationOutput',
-    moduleUrl: assetUrl('core', 'animation/animation_output'),
-    runtime: AnimationOutput
-  };
 }
 
 export function resolveIdentifier(identifier: IdentifierSpec) {
diff --git a/modules/@angular/compiler/src/offline_compiler.ts b/modules/@angular/compiler/src/offline_compiler.ts
index 90bd832096c4..65a9bb285687 100644
--- a/modules/@angular/compiler/src/offline_compiler.ts
+++ b/modules/@angular/compiler/src/offline_compiler.ts
@@ -8,6 +8,8 @@
 
 import {SchemaMetadata} from '@angular/core';
 
+import {AnimationCompiler} from './animation/animation_compiler';
+import {AnimationParser} from './animation/animation_parser';
 import {CompileDirectiveMetadata, CompileIdentifierMetadata, CompileNgModuleMetadata, CompilePipeMetadata, CompileProviderMetadata, CompileTokenMetadata, StaticSymbol, createHostComponentMeta} from './compile_metadata';
 import {DirectiveNormalizer} from './directive_normalizer';
 import {Identifiers, resolveIdentifier, resolveIdentifierToken} from './identifiers';
@@ -28,6 +30,9 @@ export class NgModulesSummary {
 }
 
 export class OfflineCompiler {
+  private _animationParser = new AnimationParser();
+  private _animationCompiler = new AnimationCompiler();
+
   constructor(
       private _metadataResolver: CompileMetadataResolver,
       private _directiveNormalizer: DirectiveNormalizer, private _templateParser: TemplateParser,
@@ -162,14 +167,19 @@ export class OfflineCompiler {
       compMeta: CompileDirectiveMetadata, directives: CompileDirectiveMetadata[],
       pipes: CompilePipeMetadata[], schemas: SchemaMetadata[], componentStyles: CompiledStylesheet,
       fileSuffix: string, targetStatements: o.Statement[]): string {
+    const parsedAnimations = this._animationParser.parseComponent(compMeta);
     const parsedTemplate = this._templateParser.parse(
         compMeta, compMeta.template.template, directives, pipes, schemas, compMeta.type.name);
     const stylesExpr = componentStyles ? o.variable(componentStyles.stylesVar) : o.literalArr([]);
-    const viewResult =
-        this._viewCompiler.compileComponent(compMeta, parsedTemplate, stylesExpr, pipes);
+    const compiledAnimations =
+        this._animationCompiler.compile(compMeta.type.name, parsedAnimations);
+    const viewResult = this._viewCompiler.compileComponent(
+        compMeta, parsedTemplate, stylesExpr, pipes, compiledAnimations);
     if (componentStyles) {
       targetStatements.push(..._resolveStyleStatements(componentStyles, fileSuffix));
     }
+    compiledAnimations.forEach(
+        entry => { entry.statements.forEach(statement => { targetStatements.push(statement); }); });
     targetStatements.push(..._resolveViewStatements(viewResult));
     return viewResult.viewFactoryVar;
   }
diff --git a/modules/@angular/compiler/src/private_import_core.ts b/modules/@angular/compiler/src/private_import_core.ts
index 5bd4cd4df19e..86e66c6730d8 100644
--- a/modules/@angular/compiler/src/private_import_core.ts
+++ b/modules/@angular/compiler/src/private_import_core.ts
@@ -75,8 +75,6 @@ export type AnimationKeyframe = typeof r._AnimationKeyframe;
 export const AnimationKeyframe: typeof r.AnimationKeyframe = r.AnimationKeyframe;
 export type AnimationStyles = typeof r._AnimationStyles;
 export const AnimationStyles: typeof r.AnimationStyles = r.AnimationStyles;
-export type AnimationOutput = typeof r._AnimationOutput;
-export const AnimationOutput: typeof r.AnimationOutput = r.AnimationOutput;
 export const ANY_STATE = r.ANY_STATE;
 export const DEFAULT_STATE = r.DEFAULT_STATE;
 export const EMPTY_STATE = r.EMPTY_STATE;
diff --git a/modules/@angular/compiler/src/provider_analyzer.ts b/modules/@angular/compiler/src/provider_analyzer.ts
index 52f7c7114226..b6160788da70 100644
--- a/modules/@angular/compiler/src/provider_analyzer.ts
+++ b/modules/@angular/compiler/src/provider_analyzer.ts
@@ -50,14 +50,14 @@ export class ProviderElementContext {
   private _hasViewContainer: boolean = false;
 
   constructor(
-      private _viewContext: ProviderViewContext, private _parent: ProviderElementContext,
+      public viewContext: ProviderViewContext, private _parent: ProviderElementContext,
       private _isViewRoot: boolean, private _directiveAsts: DirectiveAst[], attrs: AttrAst[],
       refs: ReferenceAst[], private _sourceSpan: ParseSourceSpan) {
     this._attrs = {};
     attrs.forEach((attrAst) => this._attrs[attrAst.name] = attrAst.value);
     var directivesMeta = _directiveAsts.map(directiveAst => directiveAst.directive);
     this._allProviders =
-        _resolveProvidersFromDirectives(directivesMeta, _sourceSpan, _viewContext.errors);
+        _resolveProvidersFromDirectives(directivesMeta, _sourceSpan, viewContext.errors);
     this._contentQueries = _getContentQueries(directivesMeta);
     var queriedTokens = new Map<any, boolean>();
     MapWrapper.values(this._allProviders).forEach((provider) => {
@@ -124,7 +124,7 @@ export class ProviderElementContext {
       }
       currentEl = currentEl._parent;
     }
-    queries = this._viewContext.viewQueries.get(token.reference);
+    queries = this.viewContext.viewQueries.get(token.reference);
     if (isPresent(queries)) {
       ListWrapper.addAll(result, queries);
     }
@@ -150,7 +150,7 @@ export class ProviderElementContext {
       return transformedProviderAst;
     }
     if (isPresent(this._seenProviders.get(token.reference))) {
-      this._viewContext.errors.push(new ProviderError(
+      this.viewContext.errors.push(new ProviderError(
           `Cannot instantiate cyclic dependency! ${token.name}`, this._sourceSpan));
       return null;
     }
@@ -254,9 +254,9 @@ export class ProviderElementContext {
       }
       // check @Host restriction
       if (isBlank(result)) {
-        if (!dep.isHost || this._viewContext.component.type.isHost ||
-            this._viewContext.component.type.reference === dep.token.reference ||
-            isPresent(this._viewContext.viewProviders.get(dep.token.reference))) {
+        if (!dep.isHost || this.viewContext.component.type.isHost ||
+            this.viewContext.component.type.reference === dep.token.reference ||
+            isPresent(this.viewContext.viewProviders.get(dep.token.reference))) {
           result = dep;
         } else {
           result = dep.isOptional ?
@@ -266,7 +266,7 @@ export class ProviderElementContext {
       }
     }
     if (isBlank(result)) {
-      this._viewContext.errors.push(
+      this.viewContext.errors.push(
           new ProviderError(`No provider for ${dep.token.name}`, this._sourceSpan));
     }
     return result;
diff --git a/modules/@angular/compiler/src/runtime_compiler.ts b/modules/@angular/compiler/src/runtime_compiler.ts
index 768380339ecc..1ca88871c337 100644
--- a/modules/@angular/compiler/src/runtime_compiler.ts
+++ b/modules/@angular/compiler/src/runtime_compiler.ts
@@ -7,7 +7,8 @@
  */
 
 import {Compiler, ComponentFactory, Injectable, Injector, ModuleWithComponentFactories, NgModuleFactory, Optional, Provider, SchemaMetadata, SkipSelf, Type} from '@angular/core';
-
+import {AnimationCompiler} from './animation/animation_compiler';
+import {AnimationParser} from './animation/animation_parser';
 import {CompileDirectiveMetadata, CompileIdentifierMetadata, CompileNgModuleMetadata, CompilePipeMetadata, ProviderMeta, createHostComponentMeta} from './compile_metadata';
 import {CompilerConfig} from './config';
 import {DirectiveNormalizer} from './directive_normalizer';
@@ -23,8 +24,6 @@ import {TemplateParser} from './template_parser/template_parser';
 import {SyncAsyncResult} from './util';
 import {ComponentFactoryDependency, ViewCompiler, ViewFactoryDependency} from './view_compiler/view_compiler';
 
-
-
 /**
  * An internal module of the Angular compiler that begins with component types,
  * extracts templates, and eventually produces a compiled version of the component
@@ -39,6 +38,8 @@ export class RuntimeCompiler implements Compiler {
   private _compiledTemplateCache = new Map<Type<any>, CompiledTemplate>();
   private _compiledHostTemplateCache = new Map<Type<any>, CompiledTemplate>();
   private _compiledNgModuleCache = new Map<Type<any>, NgModuleFactory<any>>();
+  private _animationParser = new AnimationParser();
+  private _animationCompiler = new AnimationCompiler();
 
   constructor(
       private _injector: Injector, private _metadataResolver: CompileMetadataResolver,
@@ -253,12 +254,15 @@ export class RuntimeCompiler implements Compiler {
         stylesCompileResult.componentStylesheet, externalStylesheetsByModuleUrl);
     const viewCompMetas = template.viewComponentTypes.map(
         (compType) => this._assertComponentLoaded(compType, false).normalizedCompMeta);
+    const parsedAnimations = this._animationParser.parseComponent(compMeta);
     const parsedTemplate = this._templateParser.parse(
         compMeta, compMeta.template.template, template.viewDirectives.concat(viewCompMetas),
         template.viewPipes, template.schemas, compMeta.type.name);
+    const compiledAnimations =
+        this._animationCompiler.compile(compMeta.type.name, parsedAnimations);
     const compileResult = this._viewCompiler.compileComponent(
         compMeta, parsedTemplate, ir.variable(stylesCompileResult.componentStylesheet.stylesVar),
-        template.viewPipes);
+        template.viewPipes, compiledAnimations);
     compileResult.dependencies.forEach((dep) => {
       let depTemplate: CompiledTemplate;
       if (dep instanceof ViewFactoryDependency) {
@@ -275,6 +279,8 @@ export class RuntimeCompiler implements Compiler {
     });
     const statements =
         stylesCompileResult.componentStylesheet.statements.concat(compileResult.statements);
+    compiledAnimations.forEach(
+        entry => { entry.statements.forEach(statement => { statements.push(statement); }); });
     let factory: any;
     if (!this._compilerConfig.useJit) {
       factory = interpretStatements(statements, compileResult.viewFactoryVar);
diff --git a/modules/@angular/compiler/src/template_parser/template_ast.ts b/modules/@angular/compiler/src/template_parser/template_ast.ts
index 11f57a0e43e8..d8d916e1739a 100644
--- a/modules/@angular/compiler/src/template_parser/template_ast.ts
+++ b/modules/@angular/compiler/src/template_parser/template_ast.ts
@@ -12,11 +12,8 @@ import {CompileDirectiveMetadata, CompileProviderMetadata, CompileTokenMetadata}
 import {AST} from '../expression_parser/ast';
 import {isPresent} from '../facade/lang';
 import {ParseSourceSpan} from '../parse_util';
-
 import {LifecycleHooks} from '../private_import_core';
 
-
-
 /**
  * An Abstract Syntax Tree node representing part of a parsed Angular template.
  */
@@ -61,7 +58,8 @@ export class AttrAst implements TemplateAst {
 }
 
 /**
- * A binding for an element property (e.g. `[property]="expression"`).
+ * A binding for an element property (e.g. `[property]="expression"`) or an animation trigger (e.g.
+ * `[@trigger]="stateExp"`)
  */
 export class BoundElementPropertyAst implements TemplateAst {
   constructor(
@@ -71,14 +69,16 @@ export class BoundElementPropertyAst implements TemplateAst {
   visit(visitor: TemplateAstVisitor, context: any): any {
     return visitor.visitElementProperty(this, context);
   }
+  get isAnimation(): boolean { return this.type === PropertyBindingType.Animation; }
 }
 
 /**
- * A binding for an element event (e.g. `(event)="handler()"`).
+ * A binding for an element event (e.g. `(event)="handler()"`) or an animation trigger event (e.g.
+ * `(@trigger.phase)="callback($event)"`).
  */
 export class BoundEventAst implements TemplateAst {
   constructor(
-      public name: string, public target: string, public handler: AST,
+      public name: string, public target: string, public phase: string, public handler: AST,
       public sourceSpan: ParseSourceSpan) {}
   visit(visitor: TemplateAstVisitor, context: any): any {
     return visitor.visitEvent(this, context);
@@ -90,6 +90,7 @@ export class BoundEventAst implements TemplateAst {
       return this.name;
     }
   }
+  get isAnimation(): boolean { return !!this.phase; }
 }
 
 /**
diff --git a/modules/@angular/compiler/src/template_parser/template_parser.ts b/modules/@angular/compiler/src/template_parser/template_parser.ts
index 776ba51ae684..62adb99bcd0d 100644
--- a/modules/@angular/compiler/src/template_parser/template_parser.ts
+++ b/modules/@angular/compiler/src/template_parser/template_parser.ts
@@ -8,7 +8,7 @@
 
 import {Inject, Injectable, OpaqueToken, Optional, SchemaMetadata, SecurityContext} from '@angular/core';
 
-import {CompileDirectiveMetadata, CompilePipeMetadata, CompileTokenMetadata, removeIdentifierDuplicates} from '../compile_metadata';
+import {CompileDirectiveMetadata, CompilePipeMetadata, CompileTemplateMetadata, CompileTokenMetadata, removeIdentifierDuplicates} from '../compile_metadata';
 import {AST, ASTWithSource, BindingPipe, EmptyExpr, Interpolation, ParserError, RecursiveAstVisitor, TemplateBinding} from '../expression_parser/ast';
 import {Parser} from '../expression_parser/parser';
 import {StringMapWrapper} from '../facade/collection';
@@ -26,12 +26,13 @@ import {ProviderElementContext, ProviderViewContext} from '../provider_analyzer'
 import {ElementSchemaRegistry} from '../schema/element_schema_registry';
 import {CssSelector, SelectorMatcher} from '../selector';
 import {isStyleUrlResolvable} from '../style_url_resolver';
-import {splitAtColon} from '../util';
+import {splitAtColon, splitAtPeriod} from '../util';
 
 import {AttrAst, BoundDirectivePropertyAst, BoundElementPropertyAst, BoundEventAst, BoundTextAst, DirectiveAst, ElementAst, EmbeddedTemplateAst, NgContentAst, PropertyBindingType, ReferenceAst, TemplateAst, TemplateAstVisitor, TextAst, VariableAst, templateVisitAll} from './template_ast';
 import {PreparsedElementType, preparseElement} from './template_preparser';
 
 
+
 // Group 1 = "bind-"
 // Group 2 = "let-"
 // Group 3 = "ref-/#"
@@ -142,7 +143,6 @@ export class TemplateParser {
       const parseVisitor = new TemplateParseVisitor(
           providerViewContext, uniqDirectives, uniqPipes, schemas, this._exprParser,
           this._schemaRegistry);
-
       result = html.visitAll(parseVisitor, htmlAstWithErrors.rootNodes, EMPTY_ELEMENT_CONTEXT);
       errors.push(...parseVisitor.errors, ...providerViewContext.errors);
     } else {
@@ -444,6 +444,15 @@ class TemplateParseVisitor implements html.Visitor {
           providerContext.transformedDirectiveAsts, providerContext.transformProviders,
           providerContext.transformedHasViewContainer, children,
           hasInlineTemplates ? null : ngContentIndex, element.sourceSpan);
+
+      this._findComponentDirectives(directiveAsts)
+          .forEach(
+              componentDirectiveAst => this._validateElementAnimationInputOutputs(
+                  componentDirectiveAst.hostProperties, componentDirectiveAst.hostEvents,
+                  componentDirectiveAst.directive.template));
+
+      const componentTemplate = providerContext.viewContext.component.template;
+      this._validateElementAnimationInputOutputs(elementProps, events, componentTemplate);
     }
 
     if (hasInlineTemplates) {
@@ -469,9 +478,36 @@ class TemplateParseVisitor implements html.Visitor {
           templateProviderContext.transformedHasViewContainer, [parsedElement], ngContentIndex,
           element.sourceSpan);
     }
+
     return parsedElement;
   }
 
+  private _validateElementAnimationInputOutputs(
+      inputs: BoundElementPropertyAst[], outputs: BoundEventAst[],
+      template: CompileTemplateMetadata) {
+    const triggerLookup = new Set<string>();
+    template.animations.forEach(entry => { triggerLookup.add(entry.name); });
+
+    const animationInputs = inputs.filter(input => input.isAnimation);
+    animationInputs.forEach(input => {
+      const name = input.name;
+      if (!triggerLookup.has(name)) {
+        this._reportError(`Couldn't find an animation entry for "${name}"`, input.sourceSpan);
+      }
+    });
+
+    outputs.forEach(output => {
+      if (output.isAnimation) {
+        const found = animationInputs.find(input => input.name == output.name);
+        if (!found) {
+          this._reportError(
+              `Unable to listen on (@${output.name}.${output.phase}) because the animation trigger [@${output.name}] isn't being used on the same element`,
+              output.sourceSpan);
+        }
+      }
+    });
+  }
+
   private _parseInlineTemplateBinding(
       attr: html.Attribute, targetMatchableAttrs: string[][],
       targetProps: BoundElementOrDirectiveProperty[], targetVars: VariableAst[]): boolean {
@@ -533,7 +569,7 @@ class TemplateParseVisitor implements html.Visitor {
         this._parseReference(identifier, value, srcSpan, targetRefs);
 
       } else if (bindParts[KW_ON_IDX]) {
-        this._parseEvent(
+        this._parseEventOrAnimationEvent(
             bindParts[IDENT_KW_IDX], value, srcSpan, targetMatchableAttrs, targetEvents);
 
       } else if (bindParts[KW_BINDON_IDX]) {
@@ -544,7 +580,7 @@ class TemplateParseVisitor implements html.Visitor {
             bindParts[IDENT_KW_IDX], value, srcSpan, targetMatchableAttrs, targetEvents);
 
       } else if (bindParts[KW_AT_IDX]) {
-        if (name[0] == '@' && isPresent(value) && value.length > 0) {
+        if (_isAnimationLabel(name) && isPresent(value) && value.length > 0) {
           this._reportError(
               `Assigning animation triggers via @prop="exp" attributes with an expression is invalid.` +
                   ` Use property bindings (e.g. [@prop]="exp") or use an attribute without a value (e.g. @prop) instead.`,
@@ -565,7 +601,7 @@ class TemplateParseVisitor implements html.Visitor {
             targetAnimationProps);
 
       } else if (bindParts[IDENT_EVENT_IDX]) {
-        this._parseEvent(
+        this._parseEventOrAnimationEvent(
             bindParts[IDENT_EVENT_IDX], value, srcSpan, targetMatchableAttrs, targetEvents);
       }
     } else {
@@ -608,7 +644,7 @@ class TemplateParseVisitor implements html.Visitor {
       targetMatchableAttrs: string[][], targetProps: BoundElementOrDirectiveProperty[],
       targetAnimationProps: BoundElementPropertyAst[]) {
     const animatePropLength = ANIMATE_PROP_PREFIX.length;
-    var isAnimationProp = name[0] == '@';
+    var isAnimationProp = _isAnimationLabel(name);
     var animationPrefixLength = 1;
     if (name.substring(0, animatePropLength) == ANIMATE_PROP_PREFIX) {
       isAnimationProp = true;
@@ -635,6 +671,7 @@ class TemplateParseVisitor implements html.Visitor {
     if (!isPresent(expression) || expression.length == 0) {
       expression = 'null';
     }
+
     const ast = this._parseBinding(expression, sourceSpan);
     targetMatchableAttrs.push([name, ast.source]);
     targetAnimationProps.push(new BoundElementPropertyAst(
@@ -662,20 +699,56 @@ class TemplateParseVisitor implements html.Visitor {
   private _parseAssignmentEvent(
       name: string, expression: string, sourceSpan: ParseSourceSpan,
       targetMatchableAttrs: string[][], targetEvents: BoundEventAst[]) {
-    this._parseEvent(
+    this._parseEventOrAnimationEvent(
         `${name}Change`, `${expression}=$event`, sourceSpan, targetMatchableAttrs, targetEvents);
   }
 
+  private _parseEventOrAnimationEvent(
+      name: string, expression: string, sourceSpan: ParseSourceSpan,
+      targetMatchableAttrs: string[][], targetEvents: BoundEventAst[]) {
+    if (_isAnimationLabel(name)) {
+      name = name.substr(1);
+      this._parseAnimationEvent(name, expression, sourceSpan, targetEvents);
+    } else {
+      this._parseEvent(name, expression, sourceSpan, targetMatchableAttrs, targetEvents);
+    }
+  }
+
+  private _parseAnimationEvent(
+      name: string, expression: string, sourceSpan: ParseSourceSpan,
+      targetEvents: BoundEventAst[]) {
+    const matches = splitAtPeriod(name, [name, '']);
+    const eventName = matches[0];
+    const phase = matches[1].toLowerCase();
+    if (phase) {
+      switch (phase) {
+        case 'start':
+        case 'done':
+          const ast = this._parseAction(expression, sourceSpan);
+          targetEvents.push(new BoundEventAst(eventName, null, phase, ast, sourceSpan));
+          break;
+
+        default:
+          this._reportError(
+              `The provided animation output phase value "${phase}" for "@${eventName}" is not supported (use start or done)`,
+              sourceSpan);
+          break;
+      }
+    } else {
+      this._reportError(
+          `The animation trigger output event (@${eventName}) is missing its phase value name (start or done are currently supported)`,
+          sourceSpan);
+    }
+  }
+
   private _parseEvent(
       name: string, expression: string, sourceSpan: ParseSourceSpan,
       targetMatchableAttrs: string[][], targetEvents: BoundEventAst[]) {
     // long format: 'target: eventName'
-    const parts = splitAtColon(name, [null, name]);
-    const target = parts[0];
-    const eventName = parts[1];
+    const [target, eventName] = splitAtColon(name, [null, name]);
     const ast = this._parseAction(expression, sourceSpan);
     targetMatchableAttrs.push([name, ast.source]);
-    targetEvents.push(new BoundEventAst(eventName, target, ast, sourceSpan));
+    targetEvents.push(new BoundEventAst(eventName, target, null, ast, sourceSpan));
     // Don't detect directives for event names for now,
     // so don't add the event name to the matchableAttrs
   }
@@ -779,7 +852,7 @@ class TemplateParseVisitor implements html.Visitor {
     if (hostListeners) {
       StringMapWrapper.forEach(hostListeners, (expression: string, propName: string) => {
         if (isString(expression)) {
-          this._parseEvent(propName, expression, sourceSpan, [], targetEventAsts);
+          this._parseEventOrAnimationEvent(propName, expression, sourceSpan, [], targetEventAsts);
         } else {
           this._reportError(
               `Value of the host listener "${propName}" needs to be a string representing an expression but got "${expression}" (${typeof expression})`,
@@ -846,7 +919,7 @@ class TemplateParseVisitor implements html.Visitor {
 
     if (parts.length === 1) {
       var partValue = parts[0];
-      if (partValue[0] == '@') {
+      if (_isAnimationLabel(partValue)) {
         boundPropertyName = partValue.substr(1);
         bindingType = PropertyBindingType.Animation;
         securityContext = SecurityContext.NONE;
@@ -922,15 +995,13 @@ class TemplateParseVisitor implements html.Visitor {
     }
   }
 
+  private _findComponentDirectives(directives: DirectiveAst[]): DirectiveAst[] {
+    return directives.filter(directive => directive.directive.isComponent);
+  }
+
   private _findComponentDirectiveNames(directives: DirectiveAst[]): string[] {
-    const componentTypeNames: string[] = [];
-    directives.forEach(directive => {
-      const typeName = directive.directive.type.name;
-      if (directive.directive.isComponent) {
-        componentTypeNames.push(typeName);
-      }
-    });
-    return componentTypeNames;
+    return this._findComponentDirectives(directives)
+        .map(directive => directive.directive.type.name);
   }
 
   private _assertOnlyOneComponent(directives: DirectiveAst[], sourceSpan: ParseSourceSpan) {
@@ -1114,3 +1185,7 @@ export class PipeCollector extends RecursiveAstVisitor {
     return null;
   }
 }
+
+function _isAnimationLabel(name: string): boolean {
+  return name[0] == '@';
+}
diff --git a/modules/@angular/compiler/src/util.ts b/modules/@angular/compiler/src/util.ts
index fd8cf945f3d1..f69eb0c63c26 100644
--- a/modules/@angular/compiler/src/util.ts
+++ b/modules/@angular/compiler/src/util.ts
@@ -21,9 +21,17 @@ export function camelCaseToDashCase(input: string): string {
 }
 
 export function splitAtColon(input: string, defaultValues: string[]): string[] {
-  const colonIndex = input.indexOf(':');
-  if (colonIndex == -1) return defaultValues;
-  return [input.slice(0, colonIndex).trim(), input.slice(colonIndex + 1).trim()];
+  return _splitAt(input, ':', defaultValues);
+}
+
+export function splitAtPeriod(input: string, defaultValues: string[]): string[] {
+  return _splitAt(input, '.', defaultValues);
+}
+
+function _splitAt(input: string, character: string, defaultValues: string[]): string[] {
+  const characterIndex = input.indexOf(character);
+  if (characterIndex == -1) return defaultValues;
+  return [input.slice(0, characterIndex).trim(), input.slice(characterIndex + 1).trim()];
 }
 
 export function sanitizeIdentifier(name: string): string {
diff --git a/modules/@angular/compiler/src/view_compiler/compile_view.ts b/modules/@angular/compiler/src/view_compiler/compile_view.ts
index 9f78ba78b53d..7d429211cc18 100644
--- a/modules/@angular/compiler/src/view_compiler/compile_view.ts
+++ b/modules/@angular/compiler/src/view_compiler/compile_view.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {CompiledAnimationTriggerResult} from '../animation/animation_compiler';
+import {AnimationEntryCompileResult} from '../animation/animation_compiler';
 import {CompileDirectiveMetadata, CompileIdentifierMetadata, CompilePipeMetadata, CompileTokenMetadata} from '../compile_metadata';
 import {CompilerConfig} from '../config';
 import {ListWrapper, MapWrapper} from '../facade/collection';
@@ -72,7 +72,7 @@ export class CompileView implements NameResolver {
   constructor(
       public component: CompileDirectiveMetadata, public genConfig: CompilerConfig,
       public pipeMetas: CompilePipeMetadata[], public styles: o.Expression,
-      public animations: CompiledAnimationTriggerResult[], public viewIndex: number,
+      public animations: AnimationEntryCompileResult[], public viewIndex: number,
       public declarationElement: CompileElement, public templateVariableBindings: string[][]) {
     this.createMethod = new CompileMethod(this);
     this.animationBindingsMethod = new CompileMethod(this);
diff --git a/modules/@angular/compiler/src/view_compiler/event_binder.ts b/modules/@angular/compiler/src/view_compiler/event_binder.ts
index 947e6241f447..72a8a3de2b89 100644
--- a/modules/@angular/compiler/src/view_compiler/event_binder.ts
+++ b/modules/@angular/compiler/src/view_compiler/event_binder.ts
@@ -11,7 +11,6 @@ import {ListWrapper, StringMapWrapper} from '../facade/collection';
 import {StringWrapper, isBlank, isPresent} from '../facade/lang';
 import {Identifiers, identifierToken, resolveIdentifier} from '../identifiers';
 import * as o from '../output/output_ast';
-import {AnimationOutput} from '../private_import_core';
 import {BoundEventAst, DirectiveAst} from '../template_parser/template_ast';
 
 import {CompileBinding} from './compile_binding';
@@ -20,10 +19,6 @@ import {CompileMethod} from './compile_method';
 import {EventHandlerVars, ViewProperties} from './constants';
 import {convertCdStatementToIr} from './expression_converter';
 
-export class CompileElementAnimationOutput {
-  constructor(public listener: CompileEventListener, public output: AnimationOutput) {}
-}
-
 export class CompileEventListener {
   private _method: CompileMethod;
   private _hasComponentHostListener: boolean = false;
@@ -32,13 +27,14 @@ export class CompileEventListener {
   private _actionResultExprs: o.Expression[] = [];
 
   static getOrCreate(
-      compileElement: CompileElement, eventTarget: string, eventName: string,
+      compileElement: CompileElement, eventTarget: string, eventName: string, eventPhase: string,
       targetEventListeners: CompileEventListener[]): CompileEventListener {
     var listener = targetEventListeners.find(
-        listener => listener.eventTarget == eventTarget && listener.eventName == eventName);
+        listener => listener.eventTarget == eventTarget && listener.eventName == eventName &&
+            listener.eventPhase == eventPhase);
     if (isBlank(listener)) {
       listener = new CompileEventListener(
-          compileElement, eventTarget, eventName, targetEventListeners.length);
+          compileElement, eventTarget, eventName, eventPhase, targetEventListeners.length);
       targetEventListeners.push(listener);
     }
     return listener;
@@ -48,7 +44,7 @@ export class CompileEventListener {
 
   constructor(
       public compileElement: CompileElement, public eventTarget: string, public eventName: string,
-      listenerIndex: number) {
+      public eventPhase: string, listenerIndex: number) {
     this._method = new CompileMethod(compileElement.view);
     this._methodName =
         `_handle_${santitizeEventName(eventName)}_${compileElement.nodeIndex}_${listenerIndex}`;
@@ -119,7 +115,7 @@ export class CompileEventListener {
         disposable.set(listenExpr).toDeclStmt(o.FUNCTION_TYPE, [o.StmtModifier.Private]));
   }
 
-  listenToAnimation(output: AnimationOutput) {
+  listenToAnimation() {
     var outputListener = o.THIS_EXPR.callMethod(
         'eventHandler',
         [o.THIS_EXPR.prop(this._methodName).callMethod(o.BuiltinMethod.Bind, [o.THIS_EXPR])]);
@@ -129,11 +125,8 @@ export class CompileEventListener {
                    .callMethod(
                        'registerAnimationOutput',
                        [
-                         this.compileElement.renderNode,
-                         o.importExpr(resolveIdentifier(Identifiers.AnimationOutput)).instantiate([
-                           o.literal(output.name), o.literal(output.phase)
-                         ]),
-                         outputListener
+                         this.compileElement.renderNode, o.literal(this.eventName),
+                         o.literal(this.eventPhase), outputListener
                        ])
                    .toStmt();
     this.compileElement.view.createMethod.addStmt(stmt);
@@ -160,7 +153,7 @@ export function collectEventListeners(
   hostEvents.forEach((hostEvent) => {
     compileElement.view.bindings.push(new CompileBinding(compileElement, hostEvent));
     var listener = CompileEventListener.getOrCreate(
-        compileElement, hostEvent.target, hostEvent.name, eventListeners);
+        compileElement, hostEvent.target, hostEvent.name, hostEvent.phase, eventListeners);
     listener.addAction(hostEvent, null, null);
   });
   dirs.forEach((directiveAst) => {
@@ -169,7 +162,7 @@ export function collectEventListeners(
     directiveAst.hostEvents.forEach((hostEvent) => {
       compileElement.view.bindings.push(new CompileBinding(compileElement, hostEvent));
       var listener = CompileEventListener.getOrCreate(
-          compileElement, hostEvent.target, hostEvent.name, eventListeners);
+          compileElement, hostEvent.target, hostEvent.name, hostEvent.phase, eventListeners);
       listener.addAction(hostEvent, directiveAst.directive, directiveInstance);
     });
   });
@@ -190,11 +183,13 @@ export function bindDirectiveOutputs(
 }
 
 export function bindRenderOutputs(eventListeners: CompileEventListener[]) {
-  eventListeners.forEach(listener => listener.listenToRenderer());
-}
-
-export function bindAnimationOutputs(eventListeners: CompileElementAnimationOutput[]) {
-  eventListeners.forEach(entry => { entry.listener.listenToAnimation(entry.output); });
+  eventListeners.forEach(listener => {
+    if (listener.eventPhase) {
+      listener.listenToAnimation();
+    } else {
+      listener.listenToRenderer();
+    }
+  });
 }
 
 function convertStmtIntoExpression(stmt: o.Statement): o.Expression {
diff --git a/modules/@angular/compiler/src/view_compiler/property_binder.ts b/modules/@angular/compiler/src/view_compiler/property_binder.ts
index 026efece67f4..19e5caaaa71a 100644
--- a/modules/@angular/compiler/src/view_compiler/property_binder.ts
+++ b/modules/@angular/compiler/src/view_compiler/property_binder.ts
@@ -31,8 +31,6 @@ function createCurrValueExpr(exprIndex: number): o.ReadVarExpr {
   return o.variable(`currVal_${exprIndex}`);  // fix syntax highlighting: `
 }
 
-const _animationViewCheckedFlagMap = new Map<CompileView, boolean>();
-
 function bind(
     view: CompileView, currValExpr: o.ReadVarExpr, fieldExpr: o.ReadPropExpr,
     parsedExpression: cdAst.AST, context: o.Expression, actions: o.Statement[],
diff --git a/modules/@angular/compiler/src/view_compiler/view_binder.ts b/modules/@angular/compiler/src/view_compiler/view_binder.ts
index 403e6cfe514c..2f98f0f151e8 100644
--- a/modules/@angular/compiler/src/view_compiler/view_binder.ts
+++ b/modules/@angular/compiler/src/view_compiler/view_binder.ts
@@ -7,18 +7,16 @@
  */
 import {ListWrapper} from '../facade/collection';
 import {identifierToken} from '../identifiers';
-import {AnimationOutput} from '../private_import_core';
 import {AttrAst, BoundDirectivePropertyAst, BoundElementPropertyAst, BoundEventAst, BoundTextAst, DirectiveAst, ElementAst, EmbeddedTemplateAst, NgContentAst, ReferenceAst, TemplateAst, TemplateAstVisitor, TextAst, VariableAst, templateVisitAll} from '../template_parser/template_ast';
 
 import {CompileElement, CompileNode} from './compile_element';
 import {CompileView} from './compile_view';
-import {CompileElementAnimationOutput, CompileEventListener, bindAnimationOutputs, bindDirectiveOutputs, bindRenderOutputs, collectEventListeners} from './event_binder';
+import {CompileEventListener, bindDirectiveOutputs, bindRenderOutputs, collectEventListeners} from './event_binder';
 import {bindDirectiveAfterContentLifecycleCallbacks, bindDirectiveAfterViewLifecycleCallbacks, bindDirectiveDetectChangesLifecycleCallbacks, bindInjectableDestroyLifecycleCallbacks, bindPipeDestroyLifecycleCallbacks} from './lifecycle_binder';
 import {bindDirectiveHostProps, bindDirectiveInputs, bindRenderInputs, bindRenderText} from './property_binder';
 
-export function bindView(
-    view: CompileView, parsedTemplate: TemplateAst[], animationOutputs: AnimationOutput[]): void {
-  var visitor = new ViewBinderVisitor(view, animationOutputs);
+export function bindView(view: CompileView, parsedTemplate: TemplateAst[]): void {
+  var visitor = new ViewBinderVisitor(view);
   templateVisitAll(visitor, parsedTemplate);
   view.pipes.forEach(
       (pipe) => { bindPipeDestroyLifecycleCallbacks(pipe.meta, pipe.instance, pipe.view); });
@@ -26,12 +24,8 @@ export function bindView(
 
 class ViewBinderVisitor implements TemplateAstVisitor {
   private _nodeIndex: number = 0;
-  private _animationOutputsMap: {[key: string]: AnimationOutput} = {};
 
-  constructor(public view: CompileView, public animationOutputs: AnimationOutput[]) {
-    animationOutputs.forEach(
-        entry => { this._animationOutputsMap[entry.fullPropertyName] = entry; });
-  }
+  constructor(public view: CompileView) {}
 
   visitBoundText(ast: BoundTextAst, parent: CompileElement): any {
     var node = this.view.nodes[this._nodeIndex++];
@@ -48,22 +42,9 @@ class ViewBinderVisitor implements TemplateAstVisitor {
   visitElement(ast: ElementAst, parent: CompileElement): any {
     var compileElement = <CompileElement>this.view.nodes[this._nodeIndex++];
     var eventListeners: CompileEventListener[] = [];
-    var animationEventListeners: CompileElementAnimationOutput[] = [];
     collectEventListeners(ast.outputs, ast.directives, compileElement).forEach(entry => {
-      // TODO: figure out how to abstract this `if` statement elsewhere
-      if (entry.eventName[0] == '@') {
-        let animationOutputName = entry.eventName.substr(1);
-        let output = this._animationOutputsMap[animationOutputName];
-        // no need to report an error here since the parser will
-        // have caught the missing animation trigger definition
-        if (output) {
-          animationEventListeners.push(new CompileElementAnimationOutput(entry, output));
-        }
-      } else {
-        eventListeners.push(entry);
-      }
+      eventListeners.push(entry);
     });
-    bindAnimationOutputs(animationEventListeners);
     bindRenderInputs(ast.inputs, compileElement);
     bindRenderOutputs(eventListeners);
     ast.directives.forEach((directiveAst) => {
@@ -108,7 +89,7 @@ class ViewBinderVisitor implements TemplateAstVisitor {
       var providerInstance = compileElement.instances.get(providerAst.token.reference);
       bindInjectableDestroyLifecycleCallbacks(providerAst, providerInstance, compileElement);
     });
-    bindView(compileElement.embeddedView, ast.children, this.animationOutputs);
+    bindView(compileElement.embeddedView, ast.children);
     return null;
   }
 
diff --git a/modules/@angular/compiler/src/view_compiler/view_builder.ts b/modules/@angular/compiler/src/view_compiler/view_builder.ts
index ace3e903cb34..166b160252aa 100644
--- a/modules/@angular/compiler/src/view_compiler/view_builder.ts
+++ b/modules/@angular/compiler/src/view_compiler/view_builder.ts
@@ -7,8 +7,6 @@
  */
 
 import {ChangeDetectionStrategy, ViewEncapsulation} from '@angular/core';
-
-import {AnimationCompiler} from '../animation/animation_compiler';
 import {CompileDirectiveMetadata, CompileIdentifierMetadata, CompileTokenMetadata, CompileTypeMetadata} from '../compile_metadata';
 import {ListWrapper, SetWrapper, StringMapWrapper} from '../facade/collection';
 import {StringWrapper, isPresent} from '../facade/lang';
@@ -65,8 +63,6 @@ export function finishView(view: CompileView, targetStatements: o.Statement[]) {
 class ViewBuilderVisitor implements TemplateAstVisitor {
   nestedViewCount: number = 0;
 
-  private _animationCompiler = new AnimationCompiler();
-
   constructor(
       public view: CompileView,
       public targetDependencies: Array<ViewFactoryDependency|ComponentFactoryDependency>) {}
@@ -279,12 +275,10 @@ class ViewBuilderVisitor implements TemplateAstVisitor {
         ast.hasViewContainer, true, ast.references);
     this.view.nodes.push(compileElement);
 
-    var compiledAnimations = this._animationCompiler.compileComponent(this.view.component, [ast]);
-
     this.nestedViewCount++;
     var embeddedView = new CompileView(
         this.view.component, this.view.genConfig, this.view.pipeMetas, o.NULL_EXPR,
-        compiledAnimations.triggers, this.view.viewIndex + this.nestedViewCount, compileElement,
+        this.view.animations, this.view.viewIndex + this.nestedViewCount, compileElement,
         templateVariableBindings);
     this.nestedViewCount += buildView(embeddedView, ast.children, this.targetDependencies);
 
@@ -518,7 +512,7 @@ function createViewFactory(
     templateUrlInfo = view.component.template.templateUrl;
   }
   if (view.viewIndex === 0) {
-    var animationsExpr = o.literalMap(view.animations.map(entry => [entry.name, entry.fnVariable]));
+    var animationsExpr = o.literalMap(view.animations.map(entry => [entry.name, entry.fnExp]));
     initRenderCompTypeStmts = [new o.IfStmt(renderCompTypeVar.identical(o.NULL_EXPR), [
       renderCompTypeVar
           .set(ViewConstructorVars.viewUtils.callMethod(
diff --git a/modules/@angular/compiler/src/view_compiler/view_compiler.ts b/modules/@angular/compiler/src/view_compiler/view_compiler.ts
index 073c92cb4167..2a67f7bdbd1e 100644
--- a/modules/@angular/compiler/src/view_compiler/view_compiler.ts
+++ b/modules/@angular/compiler/src/view_compiler/view_compiler.ts
@@ -8,7 +8,7 @@
 
 import {Injectable} from '@angular/core';
 
-import {AnimationCompiler} from '../animation/animation_compiler';
+import {AnimationCompiler, AnimationEntryCompileResult} from '../animation/animation_compiler';
 import {CompileDirectiveMetadata, CompilePipeMetadata} from '../compile_metadata';
 import {CompilerConfig} from '../config';
 import * as o from '../output/output_ast';
@@ -34,22 +34,18 @@ export class ViewCompiler {
 
   compileComponent(
       component: CompileDirectiveMetadata, template: TemplateAst[], styles: o.Expression,
-      pipes: CompilePipeMetadata[]): ViewCompileResult {
-    var dependencies: Array<ViewFactoryDependency|ComponentFactoryDependency> = [];
-    var compiledAnimations = this._animationCompiler.compileComponent(component, template);
-    var statements: o.Statement[] = [];
-    var animationTriggers = compiledAnimations.triggers;
-    animationTriggers.forEach(entry => {
-      statements.push(entry.statesMapStatement);
-      statements.push(entry.fnStatement);
-    });
-    var view = new CompileView(
-        component, this._genConfig, pipes, styles, animationTriggers, 0,
+      pipes: CompilePipeMetadata[],
+      compiledAnimations: AnimationEntryCompileResult[]): ViewCompileResult {
+    const dependencies: Array<ViewFactoryDependency|ComponentFactoryDependency> = [];
+    const view = new CompileView(
+        component, this._genConfig, pipes, styles, compiledAnimations, 0,
         CompileElement.createNull(), []);
+
+    const statements: o.Statement[] = [];
     buildView(view, template, dependencies);
     // Need to separate binding from creation to be able to refer to
     // variables that have been declared after usage.
-    bindView(view, template, compiledAnimations.outputs);
+    bindView(view, template);
     finishView(view, statements);
 
     return new ViewCompileResult(statements, view.viewFactory.name, dependencies);
diff --git a/modules/@angular/compiler/test/animation/animation_compiler_spec.ts b/modules/@angular/compiler/test/animation/animation_compiler_spec.ts
index 094a3da956a3..bdb6b4f22188 100644
--- a/modules/@angular/compiler/test/animation/animation_compiler_spec.ts
+++ b/modules/@angular/compiler/test/animation/animation_compiler_spec.ts
@@ -10,7 +10,8 @@ import {AnimationMetadata, animate, group, sequence, style, transition, trigger}
 import {AsyncTestCompleter, beforeEach, beforeEachProviders, ddescribe, describe, expect, iit, inject, it, xdescribe, xit} from '@angular/core/testing/testing_internal';
 
 import {StringMapWrapper} from '../../../platform-browser-dynamic/src/facade/collection';
-import {AnimationCompiler, CompiledAnimationTriggerResult} from '../../src/animation/animation_compiler';
+import {AnimationCompiler, AnimationEntryCompileResult} from '../../src/animation/animation_compiler';
+import {AnimationParser} from '../../src/animation/animation_parser';
 import {CompileAnimationEntryMetadata, CompileDirectiveMetadata, CompileTemplateMetadata, CompileTypeMetadata} from '../../src/compile_metadata';
 import {CompileMetadataResolver} from '../../src/metadata_resolver';
 
@@ -20,12 +21,13 @@ export function main() {
     beforeEach(
         inject([CompileMetadataResolver], (res: CompileMetadataResolver) => { resolver = res; }));
 
-    var compiler = new AnimationCompiler();
+    const parser = new AnimationParser();
+    const compiler = new AnimationCompiler();
 
     var compileAnimations =
-        (component: CompileDirectiveMetadata): CompiledAnimationTriggerResult => {
-          var result = compiler.compileComponent(component, []);
-          return result.triggers[0];
+        (component: CompileDirectiveMetadata): AnimationEntryCompileResult[] => {
+          const parsedAnimations = parser.parseComponent(component);
+          return compiler.compile(component.type.name, parsedAnimations);
         };
 
     var compileTriggers = (input: any[]) => {
@@ -66,14 +68,5 @@ export function main() {
       expect(capturedErrorMessage)
           .toMatch(/Animation states via styles must be prefixed with a ":"/);
     });
-
-    it('should throw an error when two or more animation triggers contain the same name', () => {
-      var t1Data: any[] = [];
-      var t2Data: any[] = [];
-
-      expect(() => {
-        compileTriggers([['myTrigger', t1Data], ['myTrigger', t2Data]]);
-      }).toThrowError(/The animation trigger "myTrigger" has already been registered on "myCmp"/);
-    });
   });
 }
diff --git a/modules/@angular/compiler/test/animation/animation_parser_spec.ts b/modules/@angular/compiler/test/animation/animation_parser_spec.ts
index b5688715205a..1e0fd724554f 100644
--- a/modules/@angular/compiler/test/animation/animation_parser_spec.ts
+++ b/modules/@angular/compiler/test/animation/animation_parser_spec.ts
@@ -11,7 +11,8 @@ import {AsyncTestCompleter, beforeEach, beforeEachProviders, ddescribe, describe
 import {expect} from '@angular/platform-browser/testing/matchers';
 
 import {AnimationAst, AnimationEntryAst, AnimationGroupAst, AnimationKeyframeAst, AnimationSequenceAst, AnimationStateTransitionAst, AnimationStepAst, AnimationStylesAst} from '../../src/animation/animation_ast';
-import {parseAnimationEntry} from '../../src/animation/animation_parser';
+import {AnimationParser} from '../../src/animation/animation_parser';
+import {CompileDirectiveMetadata, CompileTemplateMetadata, CompileTypeMetadata} from '../../src/compile_metadata';
 import {StringMapWrapper} from '../../src/facade/collection';
 import {CompileMetadataResolver} from '../../src/metadata_resolver';
 import {FILL_STYLE_FLAG, flattenStyles} from '../private_import_core';
@@ -46,9 +47,10 @@ export function main() {
         inject([CompileMetadataResolver], (res: CompileMetadataResolver) => { resolver = res; }));
 
     var parseAnimation = (data: AnimationMetadata[]) => {
-      var entry = trigger('myAnimation', [transition('state1 => state2', sequence(data))]);
-      var compiledAnimationEntry = resolver.getAnimationEntryMetadata(entry);
-      return parseAnimationEntry(compiledAnimationEntry);
+      const entry = trigger('myAnimation', [transition('state1 => state2', sequence(data))]);
+      const compiledAnimationEntry = resolver.getAnimationEntryMetadata(entry);
+      const parser = new AnimationParser();
+      return parser.parseEntry(compiledAnimationEntry);
     };
 
     var getAnimationAstFromEntryAst =
diff --git a/modules/@angular/compiler/test/template_parser/template_parser_spec.ts b/modules/@angular/compiler/test/template_parser/template_parser_spec.ts
index 00a4842d46c0..dceedebcd4b3 100644
--- a/modules/@angular/compiler/test/template_parser/template_parser_spec.ts
+++ b/modules/@angular/compiler/test/template_parser/template_parser_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {CompileDiDependencyMetadata, CompileDirectiveMetadata, CompilePipeMetadata, CompileProviderMetadata, CompileQueryMetadata, CompileTemplateMetadata, CompileTokenMetadata, CompileTypeMetadata} from '@angular/compiler/src/compile_metadata';
+import {CompileAnimationEntryMetadata, CompileDiDependencyMetadata, CompileDirectiveMetadata, CompilePipeMetadata, CompileProviderMetadata, CompileQueryMetadata, CompileTemplateMetadata, CompileTokenMetadata, CompileTypeMetadata} from '@angular/compiler/src/compile_metadata';
 import {DomElementSchemaRegistry} from '@angular/compiler/src/schema/dom_element_schema_registry';
 import {ElementSchemaRegistry} from '@angular/compiler/src/schema/element_schema_registry';
 import {AttrAst, BoundDirectivePropertyAst, BoundElementPropertyAst, BoundEventAst, BoundTextAst, DirectiveAst, ElementAst, EmbeddedTemplateAst, NgContentAst, PropertyBindingType, ProviderAstType, ReferenceAst, TemplateAst, TemplateAstVisitor, TextAst, VariableAst, templateVisitAll} from '@angular/compiler/src/template_parser/template_ast';
@@ -16,7 +16,6 @@ import {SchemaMetadata, SecurityContext, Type} from '@angular/core';
 import {Console} from '@angular/core/src/console';
 import {TestBed} from '@angular/core/testing';
 import {afterEach, beforeEach, beforeEachProviders, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
-
 import {Identifiers, identifierToken, resolveIdentifierToken} from '../../src/identifiers';
 import {DEFAULT_INTERPOLATION_CONFIG, InterpolationConfig} from '../../src/ml_parser/interpolation_config';
 import {MockSchemaRegistry} from '../../testing/index';
@@ -32,9 +31,9 @@ const MOCK_SCHEMA_REGISTRY = [{
 
 export function main() {
   var ngIf: CompileDirectiveMetadata;
-  var parse:
-      (template: string, directives: CompileDirectiveMetadata[], pipes?: CompilePipeMetadata[]) =>
-          TemplateAst[];
+  var parse: (
+      template: string, directives: CompileDirectiveMetadata[], pipes?: CompilePipeMetadata[],
+      schemas?: SchemaMetadata[]) => TemplateAst[];
   var console: ArrayConsole;
 
   function commonBeforeEach() {
@@ -43,14 +42,18 @@ export function main() {
       TestBed.configureCompiler({providers: [{provide: Console, useValue: console}]});
     });
     beforeEach(inject([TemplateParser], (parser: TemplateParser) => {
+      var someAnimation = new CompileAnimationEntryMetadata('someAnimation', []);
+      var someTemplate = new CompileTemplateMetadata({animations: [someAnimation]});
       var component = CompileDirectiveMetadata.create({
         selector: 'root',
+        template: someTemplate,
         type: new CompileTypeMetadata(
             {moduleUrl: someModuleUrl, name: 'Root', reference: {} as Type<any>}),
         isComponent: true
       });
       ngIf = CompileDirectiveMetadata.create({
         selector: '[ngIf]',
+        template: someTemplate,
         type: new CompileTypeMetadata(
             {moduleUrl: someModuleUrl, name: 'NgIf', reference: {} as Type<any>}),
         inputs: ['ngIf']
@@ -302,27 +305,31 @@ Can't bind to 'invalidProp' since it isn't a known property of 'my-component'.
           ]);
         });
 
-        it('should parse bound properties via bind-animate- and not report them as animation properties',
+        it('should parse bound properties via bind-animate- and not report them as attributes',
            () => {
-             expect(humanizeTplAst(parse('<div bind-animate-something="value2">', []))).toEqual([
-               [ElementAst, 'div'],
-               [
-                 BoundElementPropertyAst, PropertyBindingType.Animation, 'something', 'value2', null
-               ]
-             ]);
+             expect(humanizeTplAst(parse('<div bind-animate-someAnimation="value2">', [], [], [])))
+                 .toEqual([
+                   [ElementAst, 'div'],
+                   [
+                     BoundElementPropertyAst, PropertyBindingType.Animation, 'someAnimation',
+                     'value2', null
+                   ]
+                 ]);
            });
 
         it('should throw an error when parsing detects non-bound properties via @ that contain a value',
            () => {
-             expect(() => { parse('<div @something="value2">', []); })
+             expect(() => { parse('<div @someAnimation="value2">', [], [], []); })
                  .toThrowError(
-                     /Assigning animation triggers via @prop="exp" attributes with an expression is invalid. Use property bindings \(e.g. \[@prop\]="exp"\) or use an attribute without a value \(e.g. @prop\) instead. \("<div \[ERROR ->\]@something="value2">"\): TestComp@0:5/);
+                     /Assigning animation triggers via @prop="exp" attributes with an expression is invalid. Use property bindings \(e.g. \[@prop\]="exp"\) or use an attribute without a value \(e.g. @prop\) instead. \("<div \[ERROR ->\]@someAnimation="value2">"\): TestComp@0:5/);
            });
 
         it('should not issue a warning when host attributes contain a valid property-bound animation trigger',
            () => {
+             const animationEntries = [new CompileAnimationEntryMetadata('prop', [])];
              var dirA = CompileDirectiveMetadata.create({
                selector: 'div',
+               template: new CompileTemplateMetadata({animations: animationEntries}),
                type: new CompileTypeMetadata(
                    {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>}),
                host: {'[@prop]': 'expr'}
@@ -360,14 +367,17 @@ Can't bind to 'invalidProp' since it isn't a known property of 'my-component'.
 
         it('should not issue a warning when an animation property is bound without an expression',
            () => {
-             humanizeTplAst(parse('<div @something>', []));
+             humanizeTplAst(parse('<div @someAnimation>', [], [], []));
              expect(console.warnings.length).toEqual(0);
            });
 
         it('should parse bound properties via [@] and not report them as attributes', () => {
-          expect(humanizeTplAst(parse('<div [@something]="value2">', []))).toEqual([
+          expect(humanizeTplAst(parse('<div [@someAnimation]="value2">', [], [], []))).toEqual([
             [ElementAst, 'div'],
-            [BoundElementPropertyAst, PropertyBindingType.Animation, 'something', 'value2', null]
+            [
+              BoundElementPropertyAst, PropertyBindingType.Animation, 'someAnimation', 'value2',
+              null
+            ]
           ]);
         });
       });
diff --git a/modules/@angular/core/src/animation/animation_output.ts b/modules/@angular/core/src/animation/animation_output.ts
deleted file mode 100644
index bde629b3c95e..000000000000
--- a/modules/@angular/core/src/animation/animation_output.ts
+++ /dev/null
@@ -1,10 +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
- */
-export class AnimationOutput {
-  constructor(public name: string, public phase: string, public fullPropertyName: string) {}
-}
diff --git a/modules/@angular/core/src/core_private_export.ts b/modules/@angular/core/src/core_private_export.ts
index 6a356841dac4..980ec38066df 100644
--- a/modules/@angular/core/src/core_private_export.ts
+++ b/modules/@angular/core/src/core_private_export.ts
@@ -9,7 +9,6 @@
 import {ANY_STATE as ANY_STATE_, DEFAULT_STATE as DEFAULT_STATE_, EMPTY_STATE as EMPTY_STATE_, FILL_STYLE_FLAG as FILL_STYLE_FLAG_} from './animation/animation_constants';
 import {AnimationGroupPlayer as AnimationGroupPlayer_} from './animation/animation_group_player';
 import {AnimationKeyframe as AnimationKeyframe_} from './animation/animation_keyframe';
-import {AnimationOutput as AnimationOutput_} from './animation/animation_output';
 import {AnimationPlayer as AnimationPlayer_, NoOpAnimationPlayer as NoOpAnimationPlayer_} from './animation/animation_player';
 import {AnimationSequencePlayer as AnimationSequencePlayer_} from './animation/animation_sequence_player';
 import * as animationUtils from './animation/animation_style_util';
@@ -115,7 +114,6 @@ export var __core_private__: {
   renderStyles: typeof animationUtils.renderStyles,
   collectAndResolveStyles: typeof animationUtils.collectAndResolveStyles,
   AnimationStyles: typeof AnimationStyles_, _AnimationStyles?: AnimationStyles_,
-  AnimationOutput: typeof AnimationOutput_, _AnimationOutput?: AnimationOutput_,
   ANY_STATE: typeof ANY_STATE_,
   DEFAULT_STATE: typeof DEFAULT_STATE_,
   EMPTY_STATE: typeof EMPTY_STATE_,
@@ -183,7 +181,6 @@ export var __core_private__: {
   renderStyles: animationUtils.renderStyles,
   collectAndResolveStyles: animationUtils.collectAndResolveStyles,
   AnimationStyles: AnimationStyles_,
-  AnimationOutput: AnimationOutput_,
   ANY_STATE: ANY_STATE_,
   DEFAULT_STATE: DEFAULT_STATE_,
   EMPTY_STATE: EMPTY_STATE_,
diff --git a/modules/@angular/core/src/linker/view.ts b/modules/@angular/core/src/linker/view.ts
index 198157628e00..23cae11b167a 100644
--- a/modules/@angular/core/src/linker/view.ts
+++ b/modules/@angular/core/src/linker/view.ts
@@ -7,7 +7,6 @@
  */
 
 import {AnimationGroupPlayer} from '../animation/animation_group_player';
-import {AnimationOutput} from '../animation/animation_output';
 import {AnimationPlayer, NoOpAnimationPlayer} from '../animation/animation_player';
 import {queueAnimation} from '../animation/animation_queue';
 import {AnimationTransitionEvent} from '../animation/animation_transition_event';
@@ -53,7 +52,7 @@ export abstract class AppView<T> {
 
   public animationPlayers = new ViewAnimationMap();
 
-  private _animationListeners = new Map<any, _AnimationOutputWithHandler[]>();
+  private _animationListeners = new Map<any, _AnimationOutputHandler[]>();
 
   public context: T;
 
@@ -107,7 +106,7 @@ export abstract class AppView<T> {
         let listener = listeners[i];
         // we check for both the name in addition to the phase in the event
         // that there may be more than one @trigger on the same element
-        if (listener.output.name == animationName && listener.output.phase == phase) {
+        if (listener.eventName === animationName && listener.eventPhase === phase) {
           listener.handler(event);
           break;
         }
@@ -115,14 +114,13 @@ export abstract class AppView<T> {
     }
   }
 
-  registerAnimationOutput(element: any, outputEvent: AnimationOutput, eventHandler: Function):
-      void {
-    var entry = new _AnimationOutputWithHandler(outputEvent, eventHandler);
+  registerAnimationOutput(
+      element: any, eventName: string, eventPhase: string, eventHandler: Function): void {
     var animations = this._animationListeners.get(element);
     if (!isPresent(animations)) {
       this._animationListeners.set(element, animations = []);
     }
-    animations.push(entry);
+    animations.push(new _AnimationOutputHandler(eventName, eventPhase, eventHandler));
   }
 
   create(context: T, givenProjectableNodes: Array<any|any[]>, rootSelectorOrNode: string|any):
@@ -469,6 +467,6 @@ function _findLastRenderNode(node: any): any {
   return lastNode;
 }
 
-class _AnimationOutputWithHandler {
-  constructor(public output: AnimationOutput, public handler: Function) {}
+class _AnimationOutputHandler {
+  constructor(public eventName: string, public eventPhase: string, public handler: Function) {}
 }
diff --git a/modules/@angular/core/test/animation/animation_integration_spec.ts b/modules/@angular/core/test/animation/animation_integration_spec.ts
index 88a1f56cbe4a..622c0b3bc59b 100644
--- a/modules/@angular/core/test/animation/animation_integration_spec.ts
+++ b/modules/@angular/core/test/animation/animation_integration_spec.ts
@@ -997,7 +997,7 @@ function declareTests({useJit}: {useJit: boolean}) {
               <div *ngIf="exp" [@outer]="exp">
                 outer
                 <div *ngIf="exp2" [@inner]="exp">
-                  inner 
+                  inner
 <               </div>
 <             </div>
             `,
@@ -1234,8 +1234,7 @@ function declareTests({useJit}: {useJit: boolean}) {
              message = e.message;
            }
 
-           expect(message).toMatch(
-               /- Couldn't find the corresponding animation trigger definition for \(@something\)/);
+           expect(message).toMatch(/Couldn't find an animation entry for "something"/);
          });
 
       it('should throw an error if an animation output is referenced that is not bound to as a property on the same element',
@@ -1258,7 +1257,7 @@ function declareTests({useJit}: {useJit: boolean}) {
            }
 
            expect(message).toMatch(
-               /- Unable to listen on \(@trigger.done\) because the animation trigger \[@trigger\] isn't being used on the same element/);
+               /Unable to listen on \(@trigger.done\) because the animation trigger \[@trigger\] isn't being used on the same element/);
          });
 
       it('should throw an error if an unsupported animation output phase name is used', () => {
@@ -1287,7 +1286,7 @@ function declareTests({useJit}: {useJit: boolean}) {
         TestBed.overrideComponent(DummyIfCmp, {
           set: {
             template: `
-              <div (@trigger)="callback($event)"></div>
+              <div [@trigger]="exp" (@trigger)="callback($event)"></div>
             `,
             animations: [trigger('trigger', [transition('one => two', [animate(1000)])])]
           }
@@ -1319,7 +1318,7 @@ function declareTests({useJit}: {useJit: boolean}) {
            }
 
            expect(message).toMatch(
-               /Couldn't find the corresponding host-level animation trigger definition for \(@trigger\)/);
+               /Unable to listen on \(@trigger.done\) because the animation trigger \[@trigger\] isn't being used on the same element/);
          });
 
       it('should allow host and element-level animation bindings to be defined on the same tag/component',
@@ -1480,11 +1479,27 @@ function declareTests({useJit}: {useJit: boolean}) {
              failureMessage = e.message;
            }
 
-           expect(failureMessage)
-               .toMatch(/Animation parsing for DummyIfCmp has failed due to the following errors:/);
-           expect(failureMessage).toMatch(/- Couldn't find an animation entry for status/);
+           expect(failureMessage).toMatch(/Template parse errors:/);
+           expect(failureMessage).toMatch(/Couldn't find an animation entry for "status"/);
          });
 
+      it('should throw an error if an animation trigger is registered but is already in use', () => {
+        TestBed.overrideComponent(
+            DummyIfCmp, {set: {animations: [trigger('matias', []), trigger('matias', [])]}});
+
+        var failureMessage = '';
+        try {
+          const fixture = TestBed.createComponent(DummyLoadingCmp);
+        } catch (e) {
+          failureMessage = e.message;
+        }
+
+        expect(failureMessage).toMatch(/Animation parse errors:/);
+        expect(failureMessage)
+            .toMatch(
+                /The animation trigger "matias" has already been registered for the DummyIfCmp component/);
+      });
+
       it('should be permitted to be registered on the host element', fakeAsync(() => {
            TestBed.overrideComponent(DummyLoadingCmp, {
              set: {
@@ -1521,7 +1536,7 @@ function declareTests({useJit}: {useJit: boolean}) {
              failureMessage = e.message;
            }
 
-           expect(failureMessage).toMatch(/- Couldn't find an animation entry for loading/);
+           expect(failureMessage).toMatch(/Couldn't find an animation entry for "loading"/);
          });
 
       it('should retain the destination animation state styles once the animation is complete',

From 5c4215ccb457280534b55c61aa4d9decce36b4a9 Mon Sep 17 00:00:00 2001
From: Flounn <florian.lestic@orange.fr>
Date: Fri, 23 Sep 2016 22:44:01 +0200
Subject: [PATCH 19/70] Fix(http): invalidStateError if response body without
 content (#11786)

Fix(http): invalidStateError if response body without content
If the responseType has been specified and other than 'text', responseText throw an InvalidStateError exception

See XHR doc => https://xhr.spec.whatwg.org/#the-responsetext-attribute

Unit Test to prevent invalidStateError
---
 .../@angular/http/src/backends/xhr_backend.ts   |  5 ++---
 .../http/test/backends/xhr_backend_spec.ts      | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/modules/@angular/http/src/backends/xhr_backend.ts b/modules/@angular/http/src/backends/xhr_backend.ts
index 416cf552b348..90d4f3291244 100644
--- a/modules/@angular/http/src/backends/xhr_backend.ts
+++ b/modules/@angular/http/src/backends/xhr_backend.ts
@@ -54,9 +54,8 @@ export class XHRConnection implements Connection {
       let onLoad = () => {
         // responseText is the old-school way of retrieving response (supported by IE8 & 9)
         // response/responseType properties were introduced in ResourceLoader Level2 spec (supported
-        // by
-        // IE10)
-        let body = isPresent(_xhr.response) ? _xhr.response : _xhr.responseText;
+        // by IE10)
+        let body = _xhr.response === undefined ? _xhr.responseText : _xhr.response;
         // Implicitly strip a potential XSSI prefix.
         if (isString(body)) body = body.replace(XSSI_PREFIX, '');
         let headers = Headers.fromResponseHeaderString(_xhr.getAllResponseHeaders());
diff --git a/modules/@angular/http/test/backends/xhr_backend_spec.ts b/modules/@angular/http/test/backends/xhr_backend_spec.ts
index 78cb2bec6070..0b74c4b14a43 100644
--- a/modules/@angular/http/test/backends/xhr_backend_spec.ts
+++ b/modules/@angular/http/test/backends/xhr_backend_spec.ts
@@ -686,6 +686,23 @@ Connection: keep-alive`;
            existingXHRs[0].setStatusCode(statusCode);
            existingXHRs[0].dispatchEvent('load');
          }));
+
+      it('should not throw invalidStateError if response without body and responseType not equal to text',
+         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+           const base = new BaseRequestOptions();
+           const connection = new XHRConnection(
+               new Request(
+                   base.merge(new RequestOptions({responseType: ResponseContentType.Json}))),
+               new MockBrowserXHR());
+
+           connection.response.subscribe((res: Response) => {
+             expect(res.json()).toBe(null);
+             async.done();
+           });
+
+           existingXHRs[0].setStatusCode(204);
+           existingXHRs[0].dispatchEvent('load');
+         }));
     });
   });
 }

From 6d606dd02bc6a8471141aab68eba96375d726493 Mon Sep 17 00:00:00 2001
From: Igor Minar <iminar@google.com>
Date: Fri, 23 Sep 2016 14:04:29 -0700
Subject: [PATCH 20/70] ci(travis): increase node's heap size to prevent OOM on
 travis (#11869)

---
 scripts/ci-lite/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ci-lite/build.sh b/scripts/ci-lite/build.sh
index 1c6f2f91ab2a..5510b9e1dc9f 100755
--- a/scripts/ci-lite/build.sh
+++ b/scripts/ci-lite/build.sh
@@ -12,7 +12,7 @@ cd ../..
 $(npm bin)/tsc -v
 $(npm bin)/tsc -p tools
 cp tools/@angular/tsc-wrapped/package.json dist/tools/@angular/tsc-wrapped
-node dist/tools/@angular/tsc-wrapped/src/main -p modules
+node --max-old-space-size=3000 dist/tools/@angular/tsc-wrapped/src/main -p modules
 node dist/tools/@angular/tsc-wrapped/src/main -p modules/@angular/core/tsconfig-build.json
 node dist/tools/@angular/tsc-wrapped/src/main -p modules/@angular/common/tsconfig-build.json
 node dist/tools/@angular/tsc-wrapped/src/main -p modules/@angular/router/tsconfig-build.json

From 0a8887240abb97cfed86e02990021518a986fe4d Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Fri, 23 Sep 2016 15:05:43 -0700
Subject: [PATCH 21/70] docs(ExceptionHandler): fix API docs (#11772)

fixes #11769
---
 modules/@angular/core/src/error_handler.ts | 32 ++++++++++++----------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/modules/@angular/core/src/error_handler.ts b/modules/@angular/core/src/error_handler.ts
index f9c3228d92ca..35222a225b42 100644
--- a/modules/@angular/core/src/error_handler.ts
+++ b/modules/@angular/core/src/error_handler.ts
@@ -9,18 +9,19 @@
 import {WrappedError} from './facade/errors';
 
 /**
- * Provides a hook for centralized exception handling.
+ * @whatItDoes Provides a hook for centralized exception handling.
  *
- * The default implementation of `ErrorHandler` prints error messages to the `Console`. To
- * intercept error handling,
- * write a custom exception handler that replaces this default as appropriate for your app.
+ * @description
  *
- * ### Example
+ * The default implementation of `ErrorHandler` prints error messages to the `console`. To
+ * intercept error handling, write a custom exception handler that replaces this default as
+ * appropriate for your app.
  *
- * ```javascript
+ * ### Example
  *
+ * ```
  * class MyErrorHandler implements ErrorHandler {
- *   call(error, stackTrace = null, reason = null) {
+ *   handleError(error) {
  *     // do something with the exception
  *   }
  * }
@@ -30,6 +31,7 @@ import {WrappedError} from './facade/errors';
  * })
  * class MyModule {}
  * ```
+ *
  * @stable
  */
 export class ErrorHandler {
@@ -46,9 +48,9 @@ export class ErrorHandler {
   constructor(rethrowError: boolean = true) { this.rethrowError = rethrowError; }
 
   handleError(error: any): void {
-    var originalError = this._findOriginalError(error);
-    var originalStack = this._findOriginalStack(error);
-    var context = this._findContext(error);
+    const originalError = this._findOriginalError(error);
+    const originalStack = this._findOriginalStack(error);
+    const context = this._findContext(error);
 
     this._console.error(`EXCEPTION: ${this._extractMessage(error)}`);
 
@@ -81,14 +83,14 @@ export class ErrorHandler {
     if (error) {
       return error.context ? error.context :
                              this._findContext((error as WrappedError).originalError);
-    } else {
-      return null;
     }
+
+    return null;
   }
 
   /** @internal */
   _findOriginalError(error: any): any {
-    var e = (error as WrappedError).originalError;
+    let e = (error as WrappedError).originalError;
     while (e && (e as WrappedError).originalError) {
       e = (e as WrappedError).originalError;
     }
@@ -100,8 +102,8 @@ export class ErrorHandler {
   _findOriginalStack(error: any): string {
     if (!(error instanceof Error)) return null;
 
-    var e: any = error;
-    var stack: string = e.stack;
+    let e: any = error;
+    let stack: string = e.stack;
     while (e instanceof Error && (e as WrappedError).originalError) {
       e = (e as WrappedError).originalError;
       if (e instanceof Error && e.stack) {

From f633826e9943282e3454a7472cd65abdcfafed02 Mon Sep 17 00:00:00 2001
From: Suguru Inatomi <laco0416@gmail.com>
Date: Sat, 24 Sep 2016 07:13:24 +0900
Subject: [PATCH 22/70] chore(CHANGELOG): fix wrong issue link (#11871)

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32b42b46a148..77d380efb08e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@
 * **compiler:** safe property access expressions work in event bindings ([#11724](https://github.com/angular/angular/issues/11724)) ([a95d652](https://github.com/angular/angular/commit/a95d652))
 * **compiler:** throw when Component.moduleId is not a string ([bd4045b](https://github.com/angular/angular/commit/bd4045b)), closes [#11590](https://github.com/angular/angular/issues/11590)
 * **compiler:** do not provide I18N values when they're not specified ([03aedbe](https://github.com/angular/angular/commit/03aedbe)), closes [#11643](https://github.com/angular/angular/issues/11643)
-* **core:** ContentChild descendants should be queried by default ([0dc15eb](https://github.com/angular/angular/commit/0dc15eb)), closes [#1645](https://github.com/angular/angular/issues/1645)
+* **core:** ContentChild descendants should be queried by default ([0dc15eb](https://github.com/angular/angular/commit/0dc15eb)), closes [#11645](https://github.com/angular/angular/issues/11645)
 * **forms:** disable all radios with disable() ([2860418](https://github.com/angular/angular/commit/2860418))
 * **forms:** make setDisabledState optional for reactive form directives ([#11731](https://github.com/angular/angular/issues/11731)) ([51d73d3](https://github.com/angular/angular/commit/51d73d3)), closes [#11719](https://github.com/angular/angular/issues/11719)
 * **forms:** support unbound disabled in ngModel ([#11736](https://github.com/angular/angular/issues/11736)) ([39e251e](https://github.com/angular/angular/commit/39e251e))

From b8a75818ee09a79eae52a7316164034d11a954bd Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Fri, 23 Sep 2016 16:23:28 -0700
Subject: [PATCH 23/70] docs: remove outdated docs (#11875)

---
 .../change_detection/change_detector_ref.ts   |   6 +-
 modules/@angular/core/src/linker/errors.ts    |   9 +-
 .../@angular/core/src/metadata/directives.ts  |   9 +-
 modules/@angular/core/src/zone/ng_zone.ts     |   1 -
 .../docs/change_detection/change_detection.md |  10 -
 .../docs/change_detection/expressions.md      |   7 -
 .../@angular/docs/change_detection/record.md  |   3 -
 modules/@angular/docs/core/00_index.md        |   3 -
 modules/@angular/docs/core/01_templates.md    | 610 ------------------
 modules/@angular/docs/core/02_directives.md   | 378 -----------
 modules/@angular/docs/core/03_pipes.md        |  27 -
 .../docs/core/04_decorator_directive.md       |   0
 .../docs/core/05_component_directive.md       |   5 -
 .../docs/core/06_viewport_directive.md        |   0
 modules/@angular/docs/core/07_services.md     |   0
 modules/@angular/docs/core/08_lifecycle.md    |   0
 modules/@angular/docs/core/09_compilation.md  |  21 -
 modules/@angular/docs/core/10_view.md         | 246 -------
 modules/@angular/docs/core/11_shadow_dom.md   |   0
 modules/@angular/docs/core/12_zones.md        | 108 ----
 modules/@angular/docs/migration/kebab-case.md | 239 -------
 modules/@angular/forms/src/directives.ts      |  15 +-
 22 files changed, 8 insertions(+), 1689 deletions(-)
 delete mode 100644 modules/@angular/docs/change_detection/change_detection.md
 delete mode 100644 modules/@angular/docs/change_detection/expressions.md
 delete mode 100644 modules/@angular/docs/change_detection/record.md
 delete mode 100644 modules/@angular/docs/core/00_index.md
 delete mode 100644 modules/@angular/docs/core/01_templates.md
 delete mode 100644 modules/@angular/docs/core/02_directives.md
 delete mode 100644 modules/@angular/docs/core/03_pipes.md
 delete mode 100644 modules/@angular/docs/core/04_decorator_directive.md
 delete mode 100644 modules/@angular/docs/core/05_component_directive.md
 delete mode 100644 modules/@angular/docs/core/06_viewport_directive.md
 delete mode 100644 modules/@angular/docs/core/07_services.md
 delete mode 100644 modules/@angular/docs/core/08_lifecycle.md
 delete mode 100644 modules/@angular/docs/core/09_compilation.md
 delete mode 100644 modules/@angular/docs/core/10_view.md
 delete mode 100644 modules/@angular/docs/core/11_shadow_dom.md
 delete mode 100644 modules/@angular/docs/core/12_zones.md
 delete mode 100644 modules/@angular/docs/migration/kebab-case.md

diff --git a/modules/@angular/core/src/change_detection/change_detector_ref.ts b/modules/@angular/core/src/change_detection/change_detector_ref.ts
index e91a7cd5734e..21bb7dde3885 100644
--- a/modules/@angular/core/src/change_detection/change_detector_ref.ts
+++ b/modules/@angular/core/src/change_detection/change_detector_ref.ts
@@ -41,7 +41,6 @@ export abstract class ChangeDetectorRef {
    *   template: `
    *     <cmp><cmp>
    *   `,
-   *   directives: [Cmp]
    * })
    * class App {
    * }
@@ -81,7 +80,6 @@ export abstract class ChangeDetectorRef {
    *   template: `
    *     <li *ngFor="let d of dataProvider.data">Data {{d}}</lig>
    *   `,
-   *   directives: [NgFor]
    * })
    * class GiantList {
    *   constructor(private ref: ChangeDetectorRef, private dataProvider:DataProvider) {
@@ -98,7 +96,6 @@ export abstract class ChangeDetectorRef {
    *   template: `
    *     <giant-list><giant-list>
    *   `,
-   *   directives: [GiantList]
    * })
    * class App {
    * }
@@ -166,7 +163,7 @@ export abstract class ChangeDetectorRef {
    * @Component({
    *   selector: 'live-data',
    *   inputs: ['live'],
-   *   template: `Data: {{dataProvider.data}}`
+   *   template: 'Data: {{dataProvider.data}}'
    * })
    * class LiveData {
    *   constructor(private ref: ChangeDetectorRef, private dataProvider:DataProvider) {}
@@ -186,7 +183,6 @@ export abstract class ChangeDetectorRef {
    *     Live Update: <input type="checkbox" [(ngModel)]="live">
    *     <live-data [live]="live"><live-data>
    *   `,
-   *   directives: [LiveData, FORM_DIRECTIVES]
    * })
    * class App {
    *   live = true;
diff --git a/modules/@angular/core/src/linker/errors.ts b/modules/@angular/core/src/linker/errors.ts
index 2154076327e7..704bc1addf15 100644
--- a/modules/@angular/core/src/linker/errors.ts
+++ b/modules/@angular/core/src/linker/errors.ts
@@ -25,13 +25,10 @@ import {DebugContext} from './debug_context';
  * ```typescript
  * @Component({
  *   selector: 'parent',
- *   template: `
- *     <child [prop]="parentProp"></child>
- *   `,
- *   directives: [forwardRef(() => Child)]
+ *   template: '<child [prop]="parentProp"></child>',
  * })
  * class Parent {
- *   parentProp = "init";
+ *   parentProp = 'init';
  * }
  *
  * @Directive({selector: 'child', inputs: ['prop']})
@@ -41,7 +38,7 @@ import {DebugContext} from './debug_context';
  *   set prop(v) {
  *     // this updates the parent property, which is disallowed during change detection
  *     // this will result in ExpressionChangedAfterItHasBeenCheckedError
- *     this.parent.parentProp = "updated";
+ *     this.parent.parentProp = 'updated';
  *   }
  * }
  * ```
diff --git a/modules/@angular/core/src/metadata/directives.ts b/modules/@angular/core/src/metadata/directives.ts
index 7a1cf43becd8..9fc49cf5eb65 100644
--- a/modules/@angular/core/src/metadata/directives.ts
+++ b/modules/@angular/core/src/metadata/directives.ts
@@ -928,7 +928,6 @@ export interface HostBindingDecorator {
    * @Component({
    *   selector: 'app',
    *   template: `<input [(ngModel)]="prop">`,
-   *   directives: [FORM_DIRECTIVES, NgModelStatus]
    * })
    * class App {
    *   prop;
@@ -968,8 +967,7 @@ export interface HostListenerDecorator {
    *
    * Angular will invoke the decorated method when the host element emits the specified event.
    *
-   * If the decorated method returns `false`, then `preventDefault` is applied on the DOM
-   * event.
+   * If the decorated method returns `false`, then `preventDefault` is applied on the DOM event.
    *
    * ### Example
    *
@@ -983,14 +981,13 @@ export interface HostListenerDecorator {
    *
    *   @HostListener('click', ['$event.target'])
    *   onClick(btn) {
-   *     console.log("button", btn, "number of clicks:", this.numberOfClicks++);
+   *     console.log('button', btn, 'number of clicks:', this.numberOfClicks++);
    *   }
    * }
    *
    * @Component({
    *   selector: 'app',
-   *   template: `<button counting>Increment</button>`,
-   *   directives: [CountClicks]
+   *   template: '<button counting>Increment</button>',
    * })
    * class App {}
    * ```
diff --git a/modules/@angular/core/src/zone/ng_zone.ts b/modules/@angular/core/src/zone/ng_zone.ts
index c4afd6501ffd..6f90f722fe54 100644
--- a/modules/@angular/core/src/zone/ng_zone.ts
+++ b/modules/@angular/core/src/zone/ng_zone.ts
@@ -40,7 +40,6 @@ import {NgZoneImpl} from './ng_zone_impl';
  *     <button (click)="processWithinAngularZone()">Process within Angular zone</button>
  *     <button (click)="processOutsideOfAngularZone()">Process outside of Angular zone</button>
  *   `,
- *   directives: [NgIf]
  * })
  * export class NgZoneDemo {
  *   progress: number = 0;
diff --git a/modules/@angular/docs/change_detection/change_detection.md b/modules/@angular/docs/change_detection/change_detection.md
deleted file mode 100644
index 4207687163db..000000000000
--- a/modules/@angular/docs/change_detection/change_detection.md
+++ /dev/null
@@ -1,10 +0,0 @@
-@name Change Detection
-@description
-# Change Detection
-
-* Mechanisms by which changes are detected in the model
-* DAG
-* Order of evaluation
-* Pure Functions
-* `onChange` method
-* Parser
diff --git a/modules/@angular/docs/change_detection/expressions.md b/modules/@angular/docs/change_detection/expressions.md
deleted file mode 100644
index e9cdc9aa9bb6..000000000000
--- a/modules/@angular/docs/change_detection/expressions.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Expressions
-
-## Binding Semantics
-
-### Formatters
-
-## Statement Semantics
\ No newline at end of file
diff --git a/modules/@angular/docs/change_detection/record.md b/modules/@angular/docs/change_detection/record.md
deleted file mode 100644
index 343624acec22..000000000000
--- a/modules/@angular/docs/change_detection/record.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Record
-
-## RecordRange
\ No newline at end of file
diff --git a/modules/@angular/docs/core/00_index.md b/modules/@angular/docs/core/00_index.md
deleted file mode 100644
index 95c575cf1b0b..000000000000
--- a/modules/@angular/docs/core/00_index.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Overview
-
-* High level description of all of the components.
\ No newline at end of file
diff --git a/modules/@angular/docs/core/01_templates.md b/modules/@angular/docs/core/01_templates.md
deleted file mode 100644
index abd6d2cc668b..000000000000
--- a/modules/@angular/docs/core/01_templates.md
+++ /dev/null
@@ -1,610 +0,0 @@
-# Templates
-
-Templates are markup which is added to HTML to declaratively describe how the application model should be
-projected to DOM as well as which DOM events should invoke which methods on the controller. Templates contain
-syntaxes which are core to Angular and allows for data-binding, event-binding, template-instantiation.
-
-The design of the template syntax has these properties:
-
-
-* All data-binding expressions are easily identifiable. (i.e. there is never an ambiguity whether the value should be
-  interpreted as string literal or as an expression.)
-* All events and their statements are easily identifiable.
-* All places of DOM instantiation are easily identifiable.
-* All places of variable declaration are easily identifiable.
-
-The above properties guarantee that the templates are easy to parse by tools (such as IDEs) and reason about by people.
-At no point is it necessary to understand which directives are active or what their semantics are in order to reason
-about the template runtime characteristics.
-
-
-
-## Summary
-
-Below is a summary of the kinds of syntaxes which Angular templating supports. The syntaxes are explained in more
-detail in the following sections.
-
-<table>
-  <thead>
-    <tr>
-      <th>Description</th><th>Short</th><th>Canonical</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <th>Text Interpolation</th>
-      <td>
-<pre>
-&lt;div&gt;{{exp}}&lt;/div&gt;
-</pre>
-
-Example:
-<pre>
-&lt;div&gt;
-  Hello {{name}}!
-  &lt;br&gt;
-  Goodbye {{name}}!
-&lt;/div&gt;
-</pre>
-      </td>
-      <td>
-<pre>
-&lt;div [text|index]="exp"&gt;&lt;/div&gt;
-</pre>
-
-Example:
-<pre>
-&lt;div
-  [text|0]=" 'Hello' + stringify(name) + '!' "
-  [text|2]=" 'Goodbye' + stringify(name) + '!' "&gt;
-  &lt;b&gt;x&lt;/b&gt;
-&lt;/div&gt;
-</pre>
-      </td>
-    </tr>
-    <tr>
-      <th>Property Interpolation</th>
-      <td>
-<pre>
-&lt;div name="{{exp}}"&gt;&lt;/div&gt;
-</pre>
-
-Example:
-
-<pre>
-&lt;div class="{{selected}}"&gt;&lt;/div&gt;
-</pre>
-      </td>
-      <td>
-<pre>
-&lt;div [name]="stringify(exp)"&gt;&lt;/div&gt;
-</pre>
-
-Example:
-
-<pre>
-&lt;div [title]="stringify(selected)"&gt;&lt;/div&gt;
-</pre>
-      </td>
-    </tr>
-    <tr>
-      <th>Property binding</th>
-      <td>
-<pre>
-&lt;div [prop]="exp"&gt;&lt;/div&gt;
-</pre>
-
-Example:
-
-<pre>
-&lt;div [hidden]="true"&gt;&lt;/div&gt;
-</pre>
-      </td>
-      <td>
-<pre>
-&lt;div bind-prop="exp"&gt;&lt;/div&gt;
-</pre>
-
-Example:
-
-<pre>
-&lt;div bind-hidden="true"&gt;&lt;/div&gt;
-</pre>
-      </td>
-    </tr>
-    <tr>
-      <th>Event binding (non-bubbling)</th>
-      <td>
-<pre>
-&lt;div (event)="statement"&gt;&lt;/div&gt;
-</pre>
-
-Example:
-
-<pre>
-&lt;div (click)="doX()"&gt;&lt;/div&gt;
-</pre>
-      </td>
-      <td>
-<pre>
-&lt;div on-event="statement"&gt;&lt;/div&gt;
-</pre>
-
-Example:
-
-<pre>
-&lt;video #player&gt;
-  &lt;button (click)="player.play()"&gt;play&lt;/button&gt;
-&lt;/video&gt;
-</pre>
-
-Or:
-
-<pre>
-&lt;div def="symbol"&gt;&lt;/div&gt;
-</pre>
-
-Example:
-
-<pre>
-&lt;video def="player"&gt;
-  &lt;button on-click="player.play()"&gt;play&lt;/button&gt;
-&lt;/video&gt;
-</pre>
-      </td>
-    </tr>
-    <tr>
-      <th>Inline Template</th>
-      <td>
-<pre>
-&lt;div template="..."&gt;...&lt;/div&gt;
-</pre>
-
-Example:
-
-<pre>
-&lt;ul&gt;
-  &lt;li template="for: #item of items"&gt;
-    {{item}}
-  &lt;/li&gt;
-&lt;/ul&gt;
-</pre>
-      </td>
-      <td>
-<pre>
-&lt;template&gt;...&lt;/template&gt;
-</pre>
-
-Example:
-<pre>
-&lt;ul&gt;
-  &lt;template def-for:"item"
-            bind-for-in="items"&gt;
-    &lt;li&gt;
-      {{item}}
-    &lt;/li&gt;
-  &lt;/template&gt;
-&lt;/ul&gt;
-</pre>
-      </td>
-    </tr>
-    <tr>
-      <th>Explicit Template</th>
-      <td>
-<pre>
-&lt;template&gt;...&lt;/template&gt;
-</pre>
-
-Example:
-
-<pre>
-&lt;template #for="item"
-          [for-in]="items"&gt;
-  _some_content_to_repeat_
-&lt;/template&gt;
-</pre>
-      </td>
-      <td>
-<pre>
-&lt;template&gt;...&lt;/template&gt;
-</pre>
-
-Example:
-
-<pre>
-&lt;template def-for="item"
-          bind-for-in="items"&gt;
-  _some_content_to_repeat_
-&lt;/template&gt;
-</pre>
-      </td>
-    </tr>
-  </tbody>
-</table>
-
-
-
-## Property Binding
-
-Binding application model data to the UI is the most common kind of bindings in an Angular application. The bindings
-are always in the form of `property-name` which is assigned an `expression`. The generic form is:
-
-<table>
-  <tr>
-    <th>Short form</th>
-    <td><pre>&lt;some-element [someProperty]="expression"&gt;</pre></td>
-  </tr>
-  <tr>
-    <th>Canonical form</th>
-    <td><pre>&lt;some-element bind-some-property="expression"&gt;</pre></td>
-  </tr>
-</table>
-
-
-Where:
-* `some-element` can be any existing DOM element.
-* `someProperty` or `some-property` (escaped with `[]` or `bind-`) is the name of the property on `some-element`. If
-  the property is dash-case, it will be converted into camel-case `someProperty`.
-* `expression` is a valid expression (as defined in section below).
-
-Example:
-```
-<div [title]="user.firstName">
-```
-
-In the above example the `title` property of the `div` element will be updated whenever the `user.firstName` changes
-its value.
-
-Key points:
-* The binding is to the element property not the element attribute.
-* To prevent custom element from accidentally reading the literal `expression` on the title element, the attribute name
-  is escaped. In our case the `title` is escaped to `[title]` through the addition of square brackets `[]`.
-* A binding value (in this case `user.firstName`) will always be an expression, never a string literal.
-
-NOTE: Unlike Angular v1, Angular v2 binds to properties of elements rather than attributes of elements. This is
-done to better support custom elements, and to allow binding for values other than strings.
-
-NOTE: Some editors/server side pre-processors may have trouble generating `[]` around the attribute name. For this
-reason Angular also supports a canonical version which is prefixed using `bind-`.
-
-
-
-### String Interpolation
-
-Property bindings are the only data bindings which Angular supports, but for convenience Angular supports an interpolation
-syntax which is just a short hand for the data binding syntax.
-
-```
-<span>Hello {{name}}!</span>
-```
-
-is a short hand for:
-
-```
-<span [text|0]=" 'Hello ' + stringify(name) + '!' "></span>
-```
-
-The above says to bind the `'Hello ' + stringify(name) + '!'` expression to the zero-th child of the `span`'s `text`
-property. The index is necessary in case there are more than one text nodes, or if the text node we wish to bind to
-is not the first one.
-
-Similarly the same rules apply to interpolation inside attributes.
-
-```
-<span title="Hello {{name}}!"></span>
-```
-
-is a short hand for:
-
-```
-<span [title]=" 'Hello ' + stringify(name) + '!' "></span>
-```
-
-NOTE: `stringify()` is a built in implicit function which converts its argument to a string representation, while
-keeping `null` and `undefined` as empty strings.
-
-
-
-
-## Local Variables
-
-
-
-
-## Inline Templates
-
-Data binding allows updating the DOM's properties, but it does not allow for changing of the DOM structure. To change
-DOM structure we need the ability to define child templates, and then instantiate these templates into Views. The
-Views than can be inserted and removed as needed to change the DOM structure.
-
-<table>
-  <tr>
-    <th>Short form</th>
-    <td>
-<pre>
-parent template
-&lt;element&gt;
-  &lt;some-element template="instantiating-directive-microsyntax"&gt;child template&lt;/some-element&gt;
-&lt;/element&gt;
-</pre>
-    </td>
-  </tr>
-  <tr>
-    <th>Canonical form</th>
-    <td>
-<pre>
-parent template
-&lt;element&gt;
-  &lt;template instantiating-directive-bindings&gt;
-    &lt;some-element&gt;child template&lt;/some-element&gt;
-  &lt;/template&gt;
-&lt;/element&gt;
-</pre>
-    </td>
-  </tr>
-</table>
-
-Where:
-* `template` defines a child template and designates the anchor where Views (instances of the template) will be
-  inserted. The template can be defined implicitly with `template` attribute, which turns the current element into
-  a template, or explicitly with `<template>` element. Explicit declaration is longer, but it allows for having
-  templates which have more than one root DOM node.
-* `viewport` is required for templates. The directive is responsible for deciding when
-  and in which order should child views be inserted into this location. Such a directive usually has one or
-  more bindings and can be represented as either `viewport-directive-bindings` or
-  `viewport-directive-microsyntax` on `template` element or attribute. See template microsyntax for more details.
-
-
-Example of conditionally included template:
-
-```
-Hello {{user}}!
-<div template="ngIf: isAdministrator">
-  ...administrator menu here...
-</div>
-```
-
-In the above example the `ngIf` directive determines whether the child view (an instance of the child template) should be
-inserted into the root view. The `ngIf` makes this decision based on if the `isAdministrator` binding is true.
-
-The above example is in the short form, for better clarity let's rewrite it in the canonical form, which is functionally
-identical.
-
-```
-Hello {{user}}!
-<template [ngIf]="isAdministrator">
-  <div>
-    ...administrator menu here...
-  </div>
-</template>
-```
-
-
-### Template Microsyntax
-
-Often times it is necessary to encode a lot of different bindings into a template to control how the instantiation
-of the templates occurs. One such example is `ngFor`.
-
-```
-<form #foo=form>
-</form>
-<ul>
-  <template [ngFor] #person [ngForOf]="people" #i="index">
-    <li>{{i}}. {{person}}<li>
-  </template>
-</ul>
-```
-
-Where:
-* `[ngFor]` triggers the for directive.
-* `#person` exports the implicit `ngFor` item.
-* `[ngForOf]="people"` binds an iterable object to the `ngFor` controller.
-* `#i=index` exports item index as `i`.
-
-The above example is explicit but quite wordy. For this reason in most situations a short hand version of the
-syntax is preferable.
-
-```
-<ul>
-  <li template="ngFor; #person; of=people; #i=index;">{{i}}. {{person}}<li>
-</ul>
-```
-
-Notice how each key value pair is translated to a `key=value;` statement in the `template` attribute. This makes the
-repeat syntax a much shorter, but we can do better. Turns out that most punctuation is optional in the short version
-which allows us to further shorten the text.
-
-```
-<ul>
-  <li template="ngFor #person of people #i=index">{{i}}. {{person}}<li>
-</ul>
-```
-
-We can also optionally use `var` instead of `#` and add `:` to `for` which creates the following recommended
-microsyntax for `ngFor`.
-
-```
-<ul>
-  <li template="ngFor: var person of people; var i=index">{{i}}. {{person}}<li>
-</ul>
-```
-
-Finally, we can move the `ngFor` keyword to the left hand side and prefix it with `*` as so:
-
-```
-<ul>
-  <li *ngFor="let  person of people; var i=index">{{i}}. {{person}}<li>
-</ul>
-```
-
-
-The format is intentionally defined freely, so that developers of directives can build an expressive microsyntax for
-their directives. The following code describes a more formal definition.
-
-```
-expression: ...                     // as defined in Expressions section
-local: [a-zA-Z][a-zA-Z0-9]*         // exported variable name available for binding
-internal: [a-zA-Z][a-zA-Z0-9]*      // internal variable name which the directive exports.
-key: [a-z][-|_|a-z0-9]]*            // key which maps to attribute name
-keyExpression: key[:|=]?expression  // binding which maps an expression to a property
-varExport: [#|var]local(=internal)? // binding which exports a local variable from a directive
-microsyntax: ([[key|keyExpression|varExport][;|,]?)*
-```
-
-Where
-* `expression` is an Angular expression as defined in section: Expressions.
-* `local` is a local identifier for local variables.
-* `internal` is an internal variable which the directive exports for binding.
-* `key` is an attribute name usually only used to trigger a specific directive.
-* `keyExpression` is a property name to which the expression will be bound to.
-* `varExport` allows exporting of directive internal state as variables for further binding. If no `internal` name
-  is specified, the exporting is to an implicit variable.
-* `microsyntax` allows you to build a simple microsyntax which can still clearly identify which expressions bind to
-  which properties as well as which variables are exported for binding.
-
-
-NOTE: the `template` attribute must be present to make it clear to the user that a sub-template is being created. This
-goes along with the philosophy that the developer should be able to reason about the template without understanding the
-semantics of the instantiator directive.
-
-
-
-
-## Binding Events
-
-Binding events allows wiring events from DOM (or other components) to the Angular controller.
-
-<table>
-  <tr>
-    <th>Short form</th>
-    <td><pre>&lt;some-element (someEvent)="statement"&gt;</pre></td>
-  </tr>
-  <tr>
-    <th>Canonical form</th>
-    <td><pre>&lt;some-element on-some-event="statement"&gt;</pre></td>
-  </tr>
-</table>
-
-Where:
-* `some-element` Any element which can generate DOM events (or has an angular directive which generates the event).
-* `someEvent` or `some-event` (escaped with `()` or `on-`) is the name of the event `some-event`. If the event is
-  dash-case, it will be converted into camel-case `someEvent`.
-* `statement` is a valid statement (as defined in section below).
-If the execution of the statement returns `false`, then `preventDefault`is applied on the DOM event.
-
-Angular listens to bubbled DOM events (as in the case of clicking on any child), as shown below:
-
-<table>
-  <tr>
-    <th>Short form</th>
-    <td><pre>&lt;some-element (some-event)="statement"&gt;</pre></td>
-  </tr>
-  <tr>
-    <th>Canonical form</th>
-    <td><pre>&lt;some-element on-some-event="statement"&gt;</pre></td>
-  </tr>
-</table>
-
-
-Example:
-```
-@Component(...)
-class Example {
-  submit() {
-    // do something when button is clicked
-  }
-}
-
-<button (click)="submit()">Submit</button>
-```
-
-In the above example, when clicking on the submit button angular will invoke the `submit` method on the surrounding
-component's controller.
-
-
-NOTE: Unlike Angular v1, Angular v2 treats event bindings as core constructs not as directives. This means that there
-is no need to create an event directive for each kind of event. This makes it possible for Angular v2 to easily
-bind to custom events of Custom Elements, whose event names are not known ahead of time.
-
-
-
-
-## Expressions, Statements and Formatters
-
-Angular templates contain expressions for binding to data and statements for binding to events. Expressions and statements
-have different semantics.
-
-
-### Expressions
-
-Expressions can be used to bind to properties only. Expressions represent how data should be projected to the View.
-Expressions should not have any side effect and should be idempotent. Examples of where expressions can be used in
-Angular are:
-```
-<div title="{{expression}}">{{expression}}</div>
-<div [title]="expression">...</div>
-<div bind-title="expression">...</div>
-<div template="ngIf: expression">...</div>
-```
-
-Expressions are simplified version of expression in the language in which you are writing your application. (i.e.
-expressions follow JS syntax and semantics in JS and Dart syntax and semantics in Dart). Unlike expressions in the
-language, binding expressions behave differently in following ways:
-
-* *Must be defined*: Unlike Angular v1, Angular v2 will throw an error on dereferencing fields which are not defined.
-  For example: `user.name` will throw an error if `user` is defined but it does not have `name` property. If the `name`
-  property is not known, it must be declared and set to some value such as empty string, `null` (or `undefined` in JS).
-  This is done to allow early detection of errors in the templates.
-* *Safe dereference*: Expressions `user.name` where `user` is null will throw `NullPointerException` in the language.
-  In contrast Angular will silently ignore `null` on `user`. This is done because Views often have to wait for the data
-  to arrive from the backend and many fields will be `null` until the data arrives. Safe dereference is so common in the
-  Views that we have made it the default.
-* *Single expression*: An expression must be a single statement. (i.e. no `;`)
-* *No assignments*: Binding expressions can not contain assignments.
-* *No keywords*: Binding expressions can not contain keywords such as: `var`, `if`, and so on.
-* *Formatters*: Angular expressions can be piped through formatters to further transform the binding value.
-  (See: Formatters)
-
-Examples of some expressions and their behavior:
-
-Given:
-```
-class Greeter {
-  name:string;
-}
-```
-
-* `name` : Will result in the value of the `name` property on the `Greeter` class.
-* `name.length`: Will result in either the length of the `name` string or `undefined` (`null` in Dart) if `name`
-  property is `null` or `undefined`. Example of: safe dereference.
-* `foo`: Will throw an error because `foo` is not declared on the `Greeter` class. Example of: Must be defined
-* `name=1`: Not allowed because of assignment.
-* `name; name.length`: Not allowed because of multiple statements.
-
-
-
-### Statements
-
-Statements can be used to bind to events only. Statements represent actions to trigger as a response to an event.
-Examples of where statements can be used in Angular are:
-```
-<div (click)="statements">...</div>
-<div on-click="statements">...</div>
-```
-
-Statements are similar to statements in the language in which you are writing your application. (i.e.
-statements follow JS syntax and semantics in JS and Dart syntax and semantics in Dart). Unlike statements in the
-language, binding expressions behave differently in the following ways:
-
-* *Unsafe dereference*: Expressions `user.verify()` where `user` is `null` will throw `NullPointerException` in the
-  language as well as in statements. (In contrast to Safe dereference in Angular expressions.) While Angular protects
-  you from null dereferencing in expressions due to lazy loading of data, no such protection is required for statements,
-  and doing so would make it harder to detect typos in statements.
-* *Multiple statements OK*: Statements can be composed from more than one statement. (i.e. no `doA(); doB()`)
-* *Assignments OK*: Event bindings can have side effects and hence assignments are allowed.
-* *No keywords*: Statements can not contain keywords such as: `var`, `if`, and so on.
-* *No Formatters*: Angular statements can not contain formatters. (Formatters are only useful for data binding)
-
-## Further Reading
-
-* [Template Syntax Constraints and Reasoning](https://docs.google.com/document/d/1HHy_zPLGqJj0bHMiWPzPCxn1pO5GlOYwmv-qGgl4f_s)
diff --git a/modules/@angular/docs/core/02_directives.md b/modules/@angular/docs/core/02_directives.md
deleted file mode 100644
index 8b8af380956f..000000000000
--- a/modules/@angular/docs/core/02_directives.md
+++ /dev/null
@@ -1,378 +0,0 @@
-# Directives
-
-Directives are classes which get instantiated as a response to a particular DOM structure. By controlling the DOM structure, what directives are imported, and their selectors, the developer can use the [composition pattern](http://en.wikipedia.org/wiki/Object_composition) to get a desirable application behavior.
-
-Directives are the cornerstone of an Angular application. We use Directives to break complex problems into smaller more reusable components. Directives allow the developer to turn HTML into a DSL and then control the application assembly process.
-
-Angular applications do not have a main method. Instead they have a root Component. Dependency Injection then assembles the directives into a working Angular application.
-
-Directives with an encapsulated view and an optional injector are called *Components*.
-
-
-## CSS Selectors
-
-Directives are instantiated whenever the CSS selector matches the DOM structure.
-
-Angular supports these CSS selector constructs:
-* Element name: `name`
-* Attribute: `[attribute]`
-* Attribute has value: `[attribute=value]`
-* Attribute contains value: `[attribute*=value]`
-* Class: `.class`
-* AND operation: `name[attribute]`
-* OR operation: `name,.class`
-* NOT operation: `:not(.class)`
-
-Angular does not support these (and any CSS selector which crosses element boundaries):
-* Descendant: `body div`
-* Direct descendant: `body > div`
-* Adjacent: `div + table`
-* Sibling: `div ~ table`
-* Wildcard: `*`
-* ID: `#id`
-* Pseudo selectors: `:pseudo` other than `:not`
-
-
-
-Given this DOM:
-
-```<input type="text" required class="primary">```
-
-These CSS selectors will match:
-* `input`: Triggers whenever element name is `input`.
-* `[required]`: Triggers whenever element contains a required attribute.
-* `[type=text]`: Triggers whenever element contains attribute `type` whose value is `text`.
-* `.primary`: Triggers whenever element class contains `primary`.
-
-CSS Selectors can be combined:
-* `input[type=text]`: Triggers on element name `input` which is of `type` `text`.
-* `input[type=text], textarea`: triggers on element name `input` which is of `type` `text` or element name `textarea`.
-
-
-
-## Directives
-
-The simplest kind of directive is a decorator. Directives are useful for encapsulating behavior.
-
-* Multiple decorators can be placed on a single element.
-* Directives do not introduce new evaluation context.
-* Directives are registered through the `@Directive` meta-data annotation.
-
-Here is a trivial example of a tooltip decorator. The directive will log a tooltip into the console on every time mouse enters a region:
-
-```
-@Directive({
-  selector: '[tooltip]',     | CSS Selector which triggers the decorator
-  properties: [              | List which properties need to be bound
-    'text: tooltip'          |  - DOM element tooltip property should be
-  ],                         |    mapped to the directive text property.
-  host: {                    | List which events need to be mapped.
-    '(mouseover)': 'show()'  |  - Invoke the show() method every time
-  }                          |    the mouseover event is fired.
-})                           |
-class Form {                 | Directive controller class, instantiated
-                             | when CSS matches.
-  text:string;               | text property on the Directive Controller.
-                             |
-  show() {                   | Show method which implements the show action.
-    console.log(this.text);  |
-  }
-}
-```
-
-Example of usage:
-
-```<span tooltip="Tooltip text goes here.">Some text here.</span>```
-
-The developer of an application can now freely use the `tooltip` attribute wherever the behavior is needed. The code above has taught the browser a new reusable and declarative behavior.
-
-Notice that data binding will work with this decorator with no further effort as shown below.
-
-```<span tooltip="Greetings {{user}}!">Some text here.</span>```
-
-
-
-## Components
-
-Component is a directive which uses shadow DOM to create encapsulate visual behavior. Components are typically used to create UI widgets or to break up the application into smaller components.
-
-* Only one component can be present per DOM element.
-* Component's CSS selectors usually trigger on element names. (Best practice)
-* Component has its own shadow view which is attached to the element as a Shadow DOM.
-* Shadow view context is the component instance. (i.e. template expressions are evaluated against the component instance.)
-
->> TODO(misko): Configuring the injector
-
-Example of a component:
-
-```
-@Component({                      | Component annotation
-  selector: 'pane',               | CSS selector on <pane> element
-  properties: [                   | List which property need to be bound
-    'title',                      |  - title mapped to component title
-    'open'                        |  - open attribute mapped to component's open property
-  ],                              |
-  templateUrl: 'pane.html'        | URL of template HTML
-})                                |
-class Pane {                      | Component controller class
-  title:string;                   |  - title property
-  open:boolean;
-
-  constructor() {
-    this.title = '';
-    this.open = true;
-  }
-
-  // Public API
-  toggle() => this.open = !this.open;
-  open() => this.open = true;
-  close() => this.open = false;
-}
-```
-
-`pane.html`:
-```
-<div class="outer">
-  <h1>{{title}}</h1>
-  <div class="inner" [hidden]="!open">
-    <ng-content></ng-content>
-  </div>
-</div>
-```
-
-`pane.css`:
-```
-.outer, .inner { border: 1px solid blue;}
-.h1 {background-color: blue;}
-```
-
-Example of usage:
-```
-<pane #pane title="Example Title" open="true">
-  Some text to wrap.
-</pane>
-<button (click)="pane.toggle()">toggle</button>
-
-```
-
-
-
-## Directives that use a ViewContainer
-
-Directives that use a ViewContainer can control instantiation of child views which are then inserted into the DOM. (Examples are `ngIf` and `ngFor`.)
-
-* Every `template` element creates a `ProtoView` which can be used to create Views via the ViewContainer.
-* The child views show up as siblings of the directive in the DOM.
-
->> TODO(misko): Relationship with Injection
->> TODO(misko): Instantiator can not be injected into child Views
-
-
-```
-@Directive({
-  selector: '[if]',
-  properties: [
-    'condition: if'
-  ]
-})
-export class If {
-  viewContainer: ViewContainerRef;
-  protoViewRef: ProtoViewRef;
-  view: View;
-
-  constructor(viewContainer: ViewContainerRef, protoViewRef: ProtoViewRef) {
-    this.viewContainer = viewContainer;
-    this.protoViewRef = protoViewRef;
-    this.view = null;
-  }
-
-  set condition(value) {
-    if (value) {
-      if (this.view === null) {
-        this.view = this.viewContainer.create(protoViewRef);
-      }
-    } else {
-      if (this.view !== null) {
-        this.viewContainer.remove(this.view);
-        this.view = null;
-      }
-    }
-  }
-}
-```
-
-## Dependency Injection
-
-Dependency Injection (DI) is a key aspect of directives. DI allows directives to be assembled into different [compositional](http://en.wikipedia.org/wiki/Object_composition) hierarchies. Angular encourages [composition over inheritance](http://en.wikipedia.org/wiki/Composition_over_inheritance) in the application design (but inheritance based approaches are still supported).
-
-When Angular directives are instantiated, the directive can ask for other related directives to be injected into it. By assembling the directives in different order and subtypes the application behavior can be controlled. A good mental model is that the DOM structure controls the directive instantiation graph.
-
-Directive instantiation is triggered by the directive CSS selector matching the DOM structure. In a directive's constructor, it can ask for other directives or application services. When asking for directives, the dependency is attempted to be located by its DOM hierarchy first, then if not found, by using the application level injector.
-
-To better understand the kinds of injections which are supported in Angular we have broken them down into use case examples.
-
-
-### Injecting Services
-
-Service injection is the most straight forward kind of injection which Angular supports. It involves a component configuring the `providers` or `viewProviders` and then letting the directive ask for the configured service.
-
-This example illustrates how to inject `MyService` into `House` directive.
-
-
-```
-class MyService {}                   | Assume a service which needs to be injected
-                                     | into a directive.
-                                     |
-@Component({                         | Assume a top level application component which
-  selector: 'my-app',                | configures the services to be injected.
-  viewProviders: [MyService],         |
-  templateUrl: 'my_app.html',        | Assume we have a template that needs to be
-  directives: [House]                | configured with directives to be injected.
-})                                   |
-class MyApp {}                       |
-                                     |
-@Directive({                         | This is the directive into which we would like
-  selector: '[house]'                | to inject the MyService.
-})                                   |
-class House {                        |
-  constructor(myService:MyService) { | Notice that in the constructor we can simply
-  }                                  | ask for MyService.
-}                                    |
-
-
-```
-
-Assume the following DOM structure for `my_app.html`:
-```
-<div house>     | The house attribute triggers the creation of the House directive.
-</div>          | This is equivalent to:
-                |   new House(injector.get(MyService));
-```
-
-
-### Injecting other Directives
-
-Injecting other directives into directives follows a similar mechanism as injecting services into directives, but with added constraint of visibility governed by DOM structure.
-
-There are five kinds of visibilities:
-
-* (no annotation): Inject dependent directives only if they are on the current element.
-* `@SkipSelf()`: Inject a directive if it is at any element above the current element.
-* `@child`: Inject a list of direct children which match a given type. (Used with `Query`)
-* `@descendant`: Inject a list of any children which match a given type. (Used with `Query`)
-
-NOTE: if the injection constraint can not be satisfied by the current visibility constraint, then it is forwarded to the normal injector which either provides a default value for the directive or throws an error.
-
-Here is an example of the kinds of injections which can be achieved:
-
-
-```
-@Component({                         |
-  selector: 'my-app'                 |
-  templateUrl: 'my_app.html',        |
-  directives: [Form, FieldSet,       |
-    Field, Primary]                  |
-})                                   |
-class MyApp {}                       |
-                                     |
-@Directive({ selector: 'form' })     |
-class Form {                         |
-  constructor(                       |
-    @descendant sets:Query<FieldSet> |
-  ) {                                |
-  }                                  |
-}                                    |
-                                     |
-@Directive({ selector: 'fieldset' }) |
-class FieldSet {                     |
-  constructor(                       |
-    @child sets:Query<Field>         |
-  ) { ... }                          |
-}                                    |
-                                     |
-@Directive({ selector: 'field' })    |
-class Field {                        |
-  constructor(                       |
-    @SkipSelf() field:Form,          |
-    @SkipSelf() field:FieldSet,      |
-  ) { ... }                          |
-}                                    |
-                                     |
-@Directive({ selector: '[primary]'}) |
-class Primary {                      |
-  constructor(field:Field ) { ... }  |
-}                                    |
-```
-
-Assume the following DOM structure for `my_app.html`:
-```
-<form>                         |
-  <div>                        |
-    <fieldset>                 |
-       <field primary></field> |
-       <field></field>         |
-    </fieldset>                |
-  </div>                       |
-</form>                        |
-```
-
-#### Shadow DOM effects on Directive DI
-
-Shadow DOM provides an encapsulation for components, so as a general rule it does not allow directive injections to cross the shadow DOM boundaries. To remedy this, declaratively specify the required component as an injectable.
-
-```
-@Component({
-  selector: '[kid]'
-  templateUrl: 'kid.html',
-  directives: []
-})
-class Kid {
-  constructor(
-    @SkipSelf() dad:Dad,
-    @Optional() grandpa:Grandpa
-  ) {
-    this.name = 'Billy';
-    this.dad = dad.name;
-    this.grandpa = grandpa.name;
-  }
-}
-
-@Component({
-  selector: '[dad]'
-  templateUrl: 'dad.html',
-  directives: [Kid]
-})
-class Dad {
-  constructor(@SkipSelf() dad:Grandpa) {
-    this.name = 'Joe Jr';
-    this.dad = dad.name;
-  }
-}
-
-@Component({
-  selector: '[grandpa]',
-  viewProviders: [],
-  templateUrl: 'grandpa.html',
-  directives: [Dad]
-})
-class Grandpa {
-  constructor() {
-    this.name = 'Joe';
-  }
-}
-```
-
-Assume the following DOM structure for `grandpa.html`: The Dad has access to the Grandpa.
-```
-Name: {{name}}: <br> Children: <div dad></div>
-```
-
-Assume the following DOM structure for `dad.html`: Here the rendered Kid will also have access to Grandpa.
-```
-Name: {{name}}: <br> Dad: {{dad}} <br> Children: <div kid></div>
-```
-
-## Further Reading
-
-* [Composition](http://en.wikipedia.org/wiki/Object_composition)
-* [Composition over Inheritance](http://en.wikipedia.org/wiki/Composition_over_inheritance)
diff --git a/modules/@angular/docs/core/03_pipes.md b/modules/@angular/docs/core/03_pipes.md
deleted file mode 100644
index 768a9d395799..000000000000
--- a/modules/@angular/docs/core/03_pipes.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# Pipes
-
-Pipes can be appended on the end of the expressions to translate the value to a different format. Typically used
-to control the stringification of numbers, dates, and other data, but can also be used for ordering, mapping, and 
-reducing arrays. Pipes can be chained.
-
-NOTE: Pipes are known as filters in Angular v1.
-
-Pipes syntax is:
-
-```
-<div class="movie-copy">
-  <p>
-    {{ model.getValue('copy') | async | uppercase }}
-  </p>
-  <ul>
-    <li>
-      <b>Starring</b>: {{ model.getValue('starring') | async }}
-    </li>
-    <li>
-      <b>Genres</b>: {{ model.getValue('genres') | async }}
-    </li>
-  <ul>
-</div>
-```
-
-
diff --git a/modules/@angular/docs/core/04_decorator_directive.md b/modules/@angular/docs/core/04_decorator_directive.md
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/modules/@angular/docs/core/05_component_directive.md b/modules/@angular/docs/core/05_component_directive.md
deleted file mode 100644
index 32cb4658b809..000000000000
--- a/modules/@angular/docs/core/05_component_directive.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Components
-
-* Different kinds of injections and visibility
-* Shadow DOM usage
-* 
\ No newline at end of file
diff --git a/modules/@angular/docs/core/06_viewport_directive.md b/modules/@angular/docs/core/06_viewport_directive.md
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/modules/@angular/docs/core/07_services.md b/modules/@angular/docs/core/07_services.md
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/modules/@angular/docs/core/08_lifecycle.md b/modules/@angular/docs/core/08_lifecycle.md
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/modules/@angular/docs/core/09_compilation.md b/modules/@angular/docs/core/09_compilation.md
deleted file mode 100644
index fe07ed120ba7..000000000000
--- a/modules/@angular/docs/core/09_compilation.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# HTML Template Compilation
-
-* Process by which a HTML template is converted to a ProtoView
-
-1. DOM parse()
-2. Macro
-3.
-
-# HTML Template
-
-* https://docs.google.com/document/d/1HHy_zPLGqJj0bHMiWPzPCxn1pO5GlOYwmv-qGgl4f_s
-* https://docs.google.com/document/d/1kpuR512G1b0D8egl9245OHaG0cFh0ST0ekhD_g8sxtI
-* https://docs.google.com/document/d/1DuFQKElIq293FlhQHvAp__NfP1XV9r8femZFMigm4-k
-* Must understand without understanding directives
-* IDE support
-* local variables
-
-
-# Binding Philosophy
-
-# Binding to Shadow DOM
\ No newline at end of file
diff --git a/modules/@angular/docs/core/10_view.md b/modules/@angular/docs/core/10_view.md
deleted file mode 100644
index 613fa283ebae..000000000000
--- a/modules/@angular/docs/core/10_view.md
+++ /dev/null
@@ -1,246 +0,0 @@
-# View
-
-## Overview
-
-This document explains the concept of a View.
-A View is a core primitive used by angular to render the DOM tree.
-A ViewContainer is location in a View which can accept child Views.
-Every ViewContainer has an associated ViewContainerRef than can contain any number of child Views.
-Views form a tree structure which mimics the DOM tree.
-
-* View is a core rendering construct. A running application is just a collection of Views which are
-  nested in a tree like structure. The View tree is a simplified version of the DOM tree. A View can
-  have a single DOM Element or large DOM structures. The key is that the DOM tree in the View can
-  not undergo structural changes (only property changes).
-* Views represent a running instance of a DOM View. This implies that while elements in a View
-  can change properties, they can not change structurally. (Structural changes such as, adding or
-  removing elements requires adding or removing child Views into ViewContainers).
-* View can have zero or more ViewContainers. A ViewContainer is a marker in the DOM which allows
-  the insertion of child Views.
-* Views are created from a ProtoView. A ProtoView is a compiled DOM View which is efficient at
-  creating Views.
-* View contains a context object. The context represents the object instance against which all
-  expressions are evaluated.
-* View contains a ChangeDetector for looking for detecting changes to the model.
-* View contains ElementInjector for creating Directives.
-
-## Simple View
-
-Let's examine a simple View and all of its parts in detail.
-
-Assume the following Component:
-
-```
-class Greeter {
-  greeting:string;
-
-  constructor() {
-    this.greeting = 'Hello';
-  }
-}
-```
-
-And assume following HTML View:
-
-```
-<div>
-  Your name:
-  <input var="name" type="Text">
-  <br>
-  {{greeting}} {{name.value}}!
-</div>
-```
-
-The above template is compiled by the Compiler to create a ProtoView. The ProtoView is then used to
-create an instance of the View. The instantiation process involves cloning the above template and
-locating all of the elements which contain bindings and finally instantiating the Directives
-associated with the template. (See compilation for more details.)
-
-```
-<div>                             | viewA(greeter)
-  Your name:                      | viewA(greeter)
-  <input var="name" type="Text">  | viewA(greeter): local variable 'name'
-  <br>                            | viewA(greeter)
-  {{greeting}} {{name.value}}!    | viewA(greeter): binding expression 'greeting' & 'name.value'
-</div>                            | viewA(greeter)
-```
-
-The resulting View instance looks something like this (simplified pseudo code):
-```
-viewA = new View({
-  template: ...,
-  context: new Greeter(),
-  localVars: ['name'],
-  watchExp: ['greeting', 'name.value']
-});
-```
-
-Note:
-* View uses instance of `Greeter` as the evaluation context.
-* View knows of local variables `name`.
-* View knows which expressions need to be watched.
-* View knows what needs to be updated if the watched expression changes.
-* All DOM elements are owned by single instance of the view.
-* The structure of the DOM can not change during runtime. To allow structural changes to the DOM we need
-  to understand Composed View.
-
-
-## Composed View
-
-An important part of an application is to be able to change the DOM structure to render data for the
-user. In Angular this is done by inserting child views into the ViewContainer.
-
-Let's start with a View such as:
-
-```
-<ul>
-  <li template="ngFor: let person of people">{{person}}</li>
-</ul>
-```
-
-During the compilation process the Compiler breaks the HTML template into these two ProtoViews:
-
-```
-  <li>{{person}}</li>   | protoViewB(Locals)
-```
-
-and
-
-```
-<ul>                    | protoViewA(someContext)
-  <template></template> | protoViewA(someContext): protoViewB
-</ul>                   | protoViewA(someContext)
-```
-
-
-The next step is to compose these two ProtoViews into an actual view which is rendered to the user.
-
-*Step 1:* Instantiate `viewA`
-
-```
-<ul>                    | viewA(someContext)
-  <template></template> | viewA(someContext): new NgFor(new ViewContainer(protoViewB))
-</ul>                   | viewA(someContext)
-```
-
-*Step2:* Instantiate `NgFor` directive which will receive the `ViewContainerRef`. (The ViewContainerRef
-has a reference to `protoViewA`).
-
-
-*Step3:* As the `NgFor` directive unrolls it asks the `ViewContainerRef` to instantiate `protoViewB` and insert
-it after the `ViewContainer` anchor. This is repeated for each `person` in `people`. Notice that
-
-```
-<ul>                    | viewA(someContext)
-  <template></template> | viewA(someContext): new NgFor(new ViewContainer(protoViewB))
-  <li>{{person}}</li>   | viewB0(locals0(someContext))
-  <li>{{person}}</li>   | viewB1(locals0(someContext))
-</ul>                   | viewA(someContext)
-```
-
-*Step4:* All of the bindings in the child Views are updated. Notice that in the case of `NgFor`
-the evaluation context for the `viewB0` and `viewB1` are `locals0` and `locals1` respectively.
-Locals allow the introduction of new local variables visible only within the scope of the View, and
-delegate any unknown references to the parent context.
-
-```
-<ul>                    | viewA
-  <template></template> | viewA: new NgFor(new ViewContainer(protoViewB))
-  <li>Alice</li>        | viewB0
-  <li>Bob</li>          | viewB1
-</ul>                   | viewA
-```
-
-Each View can have zero or more ViewContainers. By inserting and removing child Views to and from the
-ViewContainers, the application can mutate the DOM structure to any desirable state. A View may contain
-individual nodes or a complex DOM structure. The insertion points for the child Views, known as
-ViewContainers, contain a DOM element which acts as an anchor. The anchor is either a `template` or
-a `script` element depending on your browser. It is used to identify where the child Views will be
-inserted.
-
-## Component Views
-
-A View can also contain Components. Components contain Shadow DOM for encapsulating their internal
-rendering state. Unlike ViewContainers which can contain zero or more Views, the Component always contains
-exactly one Shadow View.
-
-```
-<div>                            | viewA
-  <my-component>                 | viewA
-    #SHADOW_ROOT                 | (encapsulation boundary)
-      <div>                      |   viewB
-         encapsulated rendering  |   viewB
-      </div>                     |   viewB
-  </my-component>                | viewA
-</div>                           | viewA
-```
-
-## Evaluation Context
-
-Each View acts as a context for evaluating its expressions. There are two kinds of contexts:
-
-1. A component controller instance and
-2. a `Locals` context for introducing local variables into the View.
-
-Let's assume following component:
-
-```
-class Greeter {
-  greeting:string;
-
-  constructor() {
-    this.greeting = 'Hello';
-  }
-}
-```
-
-And assume the following HTML View:
-
-```
-<div>                             | viewA(greeter)
-  Your name:                      | viewA(greeter)
-  <input var="name" type="Text">  | viewA(greeter)
-  <br>                            | viewA(greeter)
-  {{greeting}} {{name.value}}!    | viewA(greeter)
-</div>                            | viewA(greeter)
-```
-
-The above UI is built using a single View, and hence a single context `greeter`. It can be expressed
-in this pseudo-code.
-
-```
-var greeter = new Greeter();
-```
-
-The View contains two bindings:
-
-1. `greeting`: This is bound to the `greeting` property on the `Greeter` instance.
-2. `name.value`: This poses a problem. There is no `name` property on the `Greeter` instance. To solve
-this we wrap the `Greeter` instance in the `Local` instance like so:
-```
-var greeter = new Locals(new Greeter(), {name: ref_to_input_element })
-```
-
-
-By wrapping the `Greeter` instance into the `Locals` we allow the view to introduce variables which
-are in addition to the `Greeter` instance. During the resolution of the expressions we first check
-the locals, and then the `Greeter` instance.
-
-
-
-## View LifeCycle (Hydration and Dehydration)
-
-Views transition through a particular set of states:
-
-1. View is created from the ProtoView.
-2. View can be attached to an existing ViewContainerRef.
-3. Upon attaching View to the ViewContainerRef the View needs to be hydrated. The hydration process
-   involves instantiating all of the Directives associated with the current View.
-4. At this point the view is ready and renderable. Multiple changes can be delivered to the
-   Directives from the ChangeDetection.
-5. At some point the View can be removed. At this point all of the directives are destroyed during
-   the dehydration process and the view becomes inactive.
-6. The View has to wait until it is detached from the DOM. The delay in detaching could be caused
-   because an animation is animating the view away.
-7. After the View is detached from the DOM it is ready to be reused. The view reuse allows the
-   application to be faster in subsequent renderings.
diff --git a/modules/@angular/docs/core/11_shadow_dom.md b/modules/@angular/docs/core/11_shadow_dom.md
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/modules/@angular/docs/core/12_zones.md b/modules/@angular/docs/core/12_zones.md
deleted file mode 100644
index 070b62454990..000000000000
--- a/modules/@angular/docs/core/12_zones.md
+++ /dev/null
@@ -1,108 +0,0 @@
-# Zones
-
-A Zone is an execution context that persists across async tasks. You can think of it as thread-local storage for
-JavaScript. Zones are used to intercept all async operation callbacks in the browser. By intercepting async
-callbacks Angular can automatically execute the change detection at the end of the VM turn to update the application
-UI bindings. Zones means that in Angular v2 you don't have to remember to call `rootScope.$apply()` in your async call.
-
-## Execution Context
-
-```
-zone.inTheZone = false;
-
-zone.fork().run(function () {
-  zone.inTheZone = true;
-
-  setTimeout(function () {
-    console.log('async in the zone: ' + zone.inTheZone);
-  }, 0);
-});
-
-console.log('sync in the zone: ' + zone.inTheZone);
-```
-
-The above will log:
-
-```
-sync in the zone: false
-async in the zone: true
-```
-
-In the above example the `zone` is a global-callback-local variable. To the `zone`  we can attach arbitrary properties
-such as `inTheZone`.  When we enter the zone, we get a new `zone` context (which inherits all properties from the
-parent zone), once we leave the zone, the previous `zone` variable is restored. The key part is that when a async
-callback is scheduled in the zone, as is the case with `setTimeout`, the current `zone` variable is captured and
-restored on the callback. This is why the output of the `inTheZone` property inside the callback of the `setTimeout`
-prints `true`.
-
-
-## Callback Interception
-
-In addition to storing properties on the current `zone`, zones can also allow us to intercept all async callbacks
-and notify us before and after the callback executes.
-
-```
-zone.fork({
-  afterTask: function () {
-    // do some cleanup
-  }
-}).run(function () {
-  // do stuff
-});
-```
-
-The above example will execute the `afterTask` function not only after the `run` finishes, but also after any callback
-execution which was registered in the `run` block.
-
-## Putting it all together in Angular
-
-In Angular2 it is not necessary to notify Angular of changes manually after async callback, because a relevant
-async callbacks are intercepted. The question is how do we know which callbacks are Angular relevant?
-
-// TODO(vicb): outdated, rework.
-
-```
-/// Some other code running on page can do async operation
-document.addEventListener('mousemove', function () {
-  console.log('Mouse moved.');
-});
-
-var AngularZone = {
-  afterTask: function () {
-    console.log('ANGULAR AUTO-DIGEST!');
-  }
-};
-
-var ngZone = zone.fork(AngularZone);
-ngZone.run(function() {
-  console.log('I aware of angular, I should cause digest.');
-  document.addEventListener('click', function () {
-    console.log('Mouse clicked.');
-  });
-});
-```
-
-Will produce:
-
-```
-I aware of angular, I should cause digest.
-ANGULAR AUTO-DIGEST!
-```
-
-Moving the mouse will produce many:
-```
-Mouse moved.
-```
-
-But clicking will produce:
-```
-Mouse clicked.
-ANGULAR AUTO-DIGEST!
-```
-
-Notice how the place where the listener was registered will effect whether or not Angular will be notified of the
-async call and cause a change detection to run to update the UI.
-
-Being able to globally intercept the async operation is important to have a seamless integration with all existing
-libraries. But it is equally important to be able to differentiate between Angular and non-Angular code running
-on the same page concurrently.
diff --git a/modules/@angular/docs/migration/kebab-case.md b/modules/@angular/docs/migration/kebab-case.md
deleted file mode 100644
index 553c73c3e9fe..000000000000
--- a/modules/@angular/docs/migration/kebab-case.md
+++ /dev/null
@@ -1,239 +0,0 @@
-Angular2 templates are now case-sensitive and use camelCase in many places where dash-case was previously used ([design doc] (https://docs.google.com/document/d/1UMxTIUBTIUZNfOqwMhkLg0ANFSBtLIK9JsIu77EZaBA/edit?ts=564f7dd4)).
-
-## Overview
-
-Where you used to write:
-
-```
-<my-cmp (some-event)="someAction()" [some-property]="expression" #some-var>
-```
-
-in order to:
-  - bind to the `someEvent` event,
-  - bind to the `someProperty` property,
-  - create a `someVar` local variable
-
-You should now write:
-
-```
-<my-cmp (someEvent)="someAction()" [someProperty]="expression" #someVar>
-```
-
-Notes:
-  - while tag name are case sensitive, the best practice is to use dash case for component elements so that the browser
-    interpret them as custom elements,
-  - `(some-event)` would now bind to the `some-event` event (i.e. there is no implicit dash to camel case conversion),
-  - `[some-property]` would now bind to the `some-property` property (i.e. there is no implicit dash to camel case conversion),
-  - `#some-var` is not allowed any more ("-" can not be used in variable names).
-
-## Migration
-
-#### Templates
-
-1. Directives selectors, property bindings, event bindings, template variables and template element attributes should be changed to camel case: 
-
-  Examples:
-  - `<p *ng-if="cond">` should be changed to `<p *ngIf="cond">`,
-  - `<my-cmp [my-prop]="exp">` should be changed to `<my-cmp [myProp]="exp">`,
-  - `<my-cmp (my-event)="action()">` should be changed to `<my-cmp (myEvent)="action()">`,
-  - `<my-cmp [(my-prop)]="prop">` should be changed to `<my-cmp [(myProp)]="prop">`,
-  - `<input #my-input>` should be changed to `<input #myInput>`,
-  - `<template ng-for #my-item [ng-for-of]=items #my-index="index">` should be changed to `<template ngFor #myItem [ngForOf]=items #myIndex="index">`,
-
-  Note: while the tag names are now case-sensitive the best practice is to keep them lower-dash-cased so that the browser
-  treat them as custom elements. Using dashes in custom element names is required by the [Custom Element HTML Spec](http://www.w3.org/TR/custom-elements/#concepts).
-  This explains why the `<router-outlet>` component is left unchanged.
-
-  `on-`, `bindon-`, `bind-` and `var-` prefixes are still part of the canonical syntax and should remain unchanged (lower cased):
-  - `on-some-event` should be changed to `on-someEvent`,
-  - `bind-my-prop` should be changed to `bind-myProp`,
-  - `bindon-my-prop` should be changed to `bindon-myProp`,
-  - `var-my-var` should be changed to `var-myVar`.
-
-2. Update variable binding
-
-  - `<p #var1="a-b" var-var2="c-d">` should be changed to `<p #var1="aB" var-var2="cD">`
-
-3. The `template` attribute values should also be updated in the same way
-
-  `<p template="ng-for #my-item of items #my-index = index">` should be changed to `<p template="ngFor #myItem of items #myIndex = index">`.
-
-  Note that both angular directives and your own directives must be updated in the same way.
-
-#### Directives and Components
-
-Take the following steps to upgrade your directives and components:
-
-1. Update the selector:
-  ```
-  @Directive({selector: 'tag[attr][name=value]'})
-  @Component({selector: 'tag[attr][name=value]'})
-  ```
-
-  Tag and attributes names are case sensitive:
-  - For tag names, the best practice is to keep them lower dash cased, do not update them,
-  - For attribute names, the best practice is to convert them from lower dash case to camel case.
-
-  Examples:
-  - `custom-tag` should stay `custom-tag` (do not update tag names),
-  - `[attr-name]` should be updated to `[attrName]`,
-  - `[attr-name=someValue]` should be updated to `[attrName=someValue]`,
-  - `custom-tag[attr-name=someValue]` should be updated to `custom-tag[attrName=someValue]`
-
-  Note: attribute values and classes are still matched case insensitive.
-
-2. Update the inputs
-  ```
-  @Directive({inputs: ['myProp', 'myOtherProp: my-attr-name']})
-  ```
-
-  As attribute names are now case sensitive, they should be converted from dash to camel case where they are specified.
-  The previous decorator becomes:
-
-  ```
-  @Directive({inputs: ['myProp', 'myOtherProp: myAttrName']})
-  ```
-
-  Notes:
-    - only the long syntax (with ":") needs to be updated,
-    - `properties` is the legacy name for `inputs` and should be updated in the same way - it is a good idea to replace
-      `properties` with `inputs` at the same time as support for the former will be removed soon.
-
-  The same applies for the `@Input` decorator:
-
-  ```
-  @Input() myProp;
-  @Input('my-attr-name') myProp;
-  ```
-
-  That is they only need to be updated when the attribute name is specified:
-
-  ```
-  @Input() myProp;               // Nothing to update
-  @Input('myAttrName') myProp;   // Convert the attribute name to camel case
-  ```
-
-3. Update the outputs
-
-  Update the outputs in the same way the inputs are updated:
-
-  ```
-  @Directive({outputs: ['myEvent', 'myOtherEvent: my-event-name']})
-  ```
-
-  should be updated to:
-
-  ```
-  @Directive({outputs: ['myEvent', 'myOtherEvent: myEventName']})
-  ```
-
-  If you use `events` instead of `outputs` you should update in the same way and switch to `outputs` as `events` is deprecated.
-
-  ```
-  @Output() myEvent;
-  @Output('my-event-name') myEvent;
-  ```
-
-  should be changed to:
-
-  ```
-  @Output() myEvent;
-  @Output('myEventName') myEvent;
-  ```
-
-4. Update the host bindings
-
-  ```
-  @Directive({
-    host: {
-      '[some-prop]': 'exp',
-      '[style.background-color]': 'exp',
-      '[class.some-class]': 'exp',
-      '[attr.some-attr]': 'exp',
-      '(some-event)': 'action()',
-      'some-attr': 'value'
-    }
-  })
-  ```
-
-  should be changed to:
-
-  ```
-  @Directive({
-    host: {
-      '[someProp]': 'exp',
-      '[style.background-color]': 'exp',
-      '[class.some-class]': 'exp',
-      '[attr.some-attr]': 'exp',
-      '(someEvent)': 'action()',
-      'some-attr': 'value'
-    }
-  })
-  ```
-
-  The property bindings (`[...]`) and event bindings (`(...)`) must be updated in the same way as they are updated in a
-  template - ie converted to camel case (reminder: `[attr.]`, `[class.]` and `[style.]` should not be converted to camel case).
-
-5. Update export name
-
-  ```
-  @Directive({
-    exportAs: 'some-name'
-  })
-  ```
-
-  should be changed to:
-
-  ```
-  @Directive({
-    exportAs: 'someName'
-  })
-  ```
-
-
-# CSS
-
-As the attribute names from your templates have been updated from dash to camel case, you should also reflect the changes
-in your stylesheets.
-
-The attributes that need to be updated are the ones used in the selector and the inputs of your directives.
-
-Before:
-
-```
-// Directive
-@Directive({
-  selector: '[my-dir]',
-  inputs: ['someProp: some-input'],
-})
-
-<!-- template -->
-<div my-dir some-input="some value" not-an-input></div>
-
-/* css */
-[my-dir] { ... }
-[some-input] { ... }
-[not-an-input] { ... }
-```
-
-After:
-
-```
-// Directive
-@Directive({
-  selector: '[myDir]',
-  inputs: ['someProp: someInput'],
-})
-
-<!-- template -->
-<div myDir someInput="some value" not-an-input></div>
-
-/* css */
-[myDir] { ... }
-[someInput] { ... }
-[not-an-input] { ... }
-```
-
-Notes:
-  - `not-an-input` is not used in a selector nor it is an input of a directive, it need not be camel cased,
-  - CSS selectors are case insensitive you can use `[myDir]`, `[mydir]` or any other casing.
diff --git a/modules/@angular/forms/src/directives.ts b/modules/@angular/forms/src/directives.ts
index 62669c3e4702..e14d86fe4fce 100644
--- a/modules/@angular/forms/src/directives.ts
+++ b/modules/@angular/forms/src/directives.ts
@@ -55,20 +55,8 @@ export const REACTIVE_DRIVEN_DIRECTIVES: Type<any>[] =
     [FormControlDirective, FormGroupDirective, FormControlName, FormGroupName, FormArrayName];
 
 /**
+ * A list of all the form directives.
  *
- * A list of all the form directives used as part of a `@Component` annotation.
- *
- *  This is a shorthand for importing them each individually.
- *
- * ### Example
- *
- * ```typescript
- * @Component({
- *   selector: 'my-app',
- *   directives: [FORM_DIRECTIVES]
- * })
- * class MyApp {}
- * ```
  * @stable
  */
 export const FORM_DIRECTIVES: Type<any>[][] = [TEMPLATE_DRIVEN_DIRECTIVES, SHARED_FORM_DIRECTIVES];
@@ -76,7 +64,6 @@ export const FORM_DIRECTIVES: Type<any>[][] = [TEMPLATE_DRIVEN_DIRECTIVES, SHARE
 /**
  * @stable
  */
-
 export const REACTIVE_FORM_DIRECTIVES: Type<any>[][] =
     [REACTIVE_DRIVEN_DIRECTIVES, SHARED_FORM_DIRECTIVES];
 

From a153504212127e1d2dcda7ec73702ab0d99d8b2c Mon Sep 17 00:00:00 2001
From: Trotyl Yu <trotyl@qq.com>
Date: Wed, 28 Sep 2016 01:10:12 +0800
Subject: [PATCH 24/70] docs(router_config): add missing quote (#11925)

---
 modules/@angular/router/src/config.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/@angular/router/src/config.ts b/modules/@angular/router/src/config.ts
index 12c361b9656a..bb113390566f 100644
--- a/modules/@angular/router/src/config.ts
+++ b/modules/@angular/router/src/config.ts
@@ -61,7 +61,7 @@ import {Observable} from 'rxjs/Observable';
  * {
  *   path: 'chat/:user',
  *   component: Chat
- *   outlet: aux
+ *   outlet: 'aux'
  * }]
  * ```
  *

From c13e55c8c3b005339c0f378bb82b839824891207 Mon Sep 17 00:00:00 2001
From: Austin <amcdaniel2@gmail.com>
Date: Tue, 27 Sep 2016 13:10:45 -0400
Subject: [PATCH 25/70] (docs): removing `addProvider` from `UpgradeAdapter`
 (#11934)

The `addProvider` function in the `UpgradeAdapter` was deprecated in this [commit](https://github.com/angular/angular/commit/d21331e902341abe3fdec267d0acae223c801c52#diff-77163e956a7842149f583846c1c01651) and has been removed in final. Given this, the documentation for downgrading ng2 providers for use in ng1 is invalid.
---
 modules/@angular/upgrade/src/upgrade_adapter.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/@angular/upgrade/src/upgrade_adapter.ts b/modules/@angular/upgrade/src/upgrade_adapter.ts
index 0126d0f068b1..adf1bff4c751 100644
--- a/modules/@angular/upgrade/src/upgrade_adapter.ts
+++ b/modules/@angular/upgrade/src/upgrade_adapter.ts
@@ -480,7 +480,6 @@ export class UpgradeAdapter {
    * var adapter = new UpgradeAdapter();
    * adapter.upgradeNg1Provider('server');
    * adapter.upgradeNg1Provider('login', {asToken: Login});
-   * adapter.addProvider(Example);
    *
    * adapter.bootstrap(document.body, ['myExample']).ready((ref) => {
    *   var example: Example = ref.ng2Injector.get(Example);
@@ -508,7 +507,6 @@ export class UpgradeAdapter {
    * }
    *
    * var adapter = new UpgradeAdapter();
-   * adapter.addProvider(Example);
    *
    * var module = angular.module('myExample', []);
    * module.factory('example', adapter.downgradeNg2Provider(Example));

From e82a78e641aa736ea42cde3ba0d4f3927bd2b3f1 Mon Sep 17 00:00:00 2001
From: Austin <amcdaniel2@gmail.com>
Date: Tue, 27 Sep 2016 19:11:41 -0400
Subject: [PATCH 26/70] docs(upgrade): rename undeclared `Ng2` to
 `Ng2Component` (#11950)

---
 modules/@angular/upgrade/src/upgrade_adapter.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/@angular/upgrade/src/upgrade_adapter.ts b/modules/@angular/upgrade/src/upgrade_adapter.ts
index adf1bff4c751..72a3afe68b2c 100644
--- a/modules/@angular/upgrade/src/upgrade_adapter.ts
+++ b/modules/@angular/upgrade/src/upgrade_adapter.ts
@@ -60,7 +60,7 @@ var upgradeCount: number = 0;
  * ```
  * var adapter = new UpgradeAdapter(forwardRef(() => MyNg2Module));
  * var module = angular.module('myExample', []);
- * module.directive('ng2Comp', adapter.downgradeNg2Component(Ng2));
+ * module.directive('ng2Comp', adapter.downgradeNg2Component(Ng2Component));
  *
  * module.directive('ng1Hello', function() {
  *   return {
@@ -237,17 +237,17 @@ export class UpgradeAdapter {
    *   };
    * });
    *
-   * module.directive('ng2', adapter.downgradeNg2Component(Ng2));
+   * module.directive('ng2', adapter.downgradeNg2Component(Ng2Component));
    *
    * @Component({
    *   selector: 'ng2',
    *   template: 'ng2 template: <greet salutation="Hello" [name]="world">text</greet>'
    * })
-   * class Ng2 {
+   * class Ng2Component {
    * }
    *
    * @NgModule({
-   *   declarations: [Ng2, adapter.upgradeNg1Component('greet')],
+   *   declarations: [Ng2Component, adapter.upgradeNg1Component('greet')],
    *   imports: [BrowserModule]
    * })
    * class MyNg2Module {}

From 7e5413da89edcbc7ad3a80d9614696e8e7c74c1e Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Sun, 18 Sep 2016 15:39:26 -0700
Subject: [PATCH 27/70] refactor(facade): remove useless facades

---
 modules/@angular/benchpress/src/sampler.ts    |  4 +-
 .../test/reporter/console_reporter_spec.ts    |  4 +-
 .../@angular/benchpress/test/sampler_spec.ts  |  2 +-
 .../regression_slope_validator_spec.ts        |  2 +-
 .../test/validator/size_validator_spec.ts     |  4 +-
 .../compiler/src/css_parser/css_lexer.ts      |  6 +--
 .../@angular/compiler/src/output/path_util.ts |  5 ---
 .../src/view_compiler/view_builder.ts         | 17 +++----
 .../@angular/core/src/application_tokens.ts   |  2 +-
 .../@angular/core/src/reflection/reflector.ts |  4 +-
 .../@angular/core/testing/testing_internal.ts |  4 +-
 modules/@angular/facade/src/browser.ts        | 10 ++---
 modules/@angular/facade/src/collection.ts     | 37 ++++-----------
 modules/@angular/facade/src/lang.ts           | 30 ++-----------
 modules/@angular/facade/test/lang_spec.ts     | 17 +------
 modules/@angular/forms/src/form_builder.ts    |  6 +--
 modules/@angular/forms/src/model.ts           |  2 +-
 modules/@angular/http/src/headers.ts          |  3 --
 modules/@angular/http/test/headers_spec.ts    |  4 +-
 .../src/dom/events/key_events.ts              | 14 +++---
 .../test/browser_util_spec.ts                 | 22 ++++-----
 .../platform-server/src/parse5_adapter.ts     | 45 +++++++++----------
 .../shared/client_message_broker.ts           |  2 +-
 .../src/web_workers/shared/serializer.ts      |  4 +-
 24 files changed, 91 insertions(+), 159 deletions(-)

diff --git a/modules/@angular/benchpress/src/sampler.ts b/modules/@angular/benchpress/src/sampler.ts
index 6576f0f7a1bd..f080827e6893 100644
--- a/modules/@angular/benchpress/src/sampler.ts
+++ b/modules/@angular/benchpress/src/sampler.ts
@@ -6,10 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Inject, Injectable, OpaqueToken} from '@angular/core';
+import {Inject, Injectable} from '@angular/core';
 
 import {Options} from './common_options';
-import {Date, DateWrapper, isBlank, isPresent} from './facade/lang';
+import {isPresent} from './facade/lang';
 import {MeasureValues} from './measure_values';
 import {Metric} from './metric';
 import {Reporter} from './reporter';
diff --git a/modules/@angular/benchpress/test/reporter/console_reporter_spec.ts b/modules/@angular/benchpress/test/reporter/console_reporter_spec.ts
index f5bf67eac405..12ee9b7df9dd 100644
--- a/modules/@angular/benchpress/test/reporter/console_reporter_spec.ts
+++ b/modules/@angular/benchpress/test/reporter/console_reporter_spec.ts
@@ -9,8 +9,8 @@
 import {Provider} from '@angular/core';
 import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
 
-import {ConsoleReporter, MeasureValues, ReflectiveInjector, Reporter, SampleDescription, SampleState} from '../../index';
-import {Date, DateWrapper, isBlank, isPresent} from '../../src/facade/lang';
+import {ConsoleReporter, MeasureValues, ReflectiveInjector, SampleDescription} from '../../index';
+import {DateWrapper, isBlank, isPresent} from '../../src/facade/lang';
 
 export function main() {
   describe('console reporter', () => {
diff --git a/modules/@angular/benchpress/test/sampler_spec.ts b/modules/@angular/benchpress/test/sampler_spec.ts
index 5df862a3bae1..c9653aed3f05 100644
--- a/modules/@angular/benchpress/test/sampler_spec.ts
+++ b/modules/@angular/benchpress/test/sampler_spec.ts
@@ -9,7 +9,7 @@
 import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
 
 import {MeasureValues, Metric, Options, ReflectiveInjector, Reporter, Sampler, Validator, WebDriverAdapter} from '../index';
-import {Date, DateWrapper, isBlank, isPresent, stringify} from '../src/facade/lang';
+import {DateWrapper, isBlank, isPresent} from '../src/facade/lang';
 
 export function main() {
   var EMPTY_EXECUTE = () => {};
diff --git a/modules/@angular/benchpress/test/validator/regression_slope_validator_spec.ts b/modules/@angular/benchpress/test/validator/regression_slope_validator_spec.ts
index c77459787064..76305fb467c2 100644
--- a/modules/@angular/benchpress/test/validator/regression_slope_validator_spec.ts
+++ b/modules/@angular/benchpress/test/validator/regression_slope_validator_spec.ts
@@ -10,7 +10,7 @@ import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect,
 
 import {MeasureValues, ReflectiveInjector, RegressionSlopeValidator} from '../../index';
 import {ListWrapper} from '../../src/facade/collection';
-import {Date, DateWrapper} from '../../src/facade/lang';
+import {DateWrapper} from '../../src/facade/lang';
 
 export function main() {
   describe('regression slope validator', () => {
diff --git a/modules/@angular/benchpress/test/validator/size_validator_spec.ts b/modules/@angular/benchpress/test/validator/size_validator_spec.ts
index e9d0e4e144ff..bc8c35dc8e8a 100644
--- a/modules/@angular/benchpress/test/validator/size_validator_spec.ts
+++ b/modules/@angular/benchpress/test/validator/size_validator_spec.ts
@@ -8,9 +8,9 @@
 
 import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
 
-import {MeasureValues, ReflectiveInjector, SizeValidator, Validator} from '../../index';
+import {MeasureValues, ReflectiveInjector, SizeValidator} from '../../index';
 import {ListWrapper} from '../../src/facade/collection';
-import {Date, DateWrapper} from '../../src/facade/lang';
+import {DateWrapper} from '../../src/facade/lang';
 
 export function main() {
   describe('size validator', () => {
diff --git a/modules/@angular/compiler/src/css_parser/css_lexer.ts b/modules/@angular/compiler/src/css_parser/css_lexer.ts
index f616b85af87f..3966f203ed9d 100644
--- a/modules/@angular/compiler/src/css_parser/css_lexer.ts
+++ b/modules/@angular/compiler/src/css_parser/css_lexer.ts
@@ -9,7 +9,7 @@
 
 import * as chars from '../chars';
 import {BaseError} from '../facade/errors';
-import {StringWrapper, isPresent, resolveEnumToken} from '../facade/lang';
+import {StringWrapper, isPresent} from '../facade/lang';
 
 export enum CssTokenType {
   EOF,
@@ -223,8 +223,8 @@ export class CssScanner {
 
     var error: CssScannerError = null;
     if (!isMatchingType || (isPresent(value) && value != next.strValue)) {
-      var errorMessage = resolveEnumToken(CssTokenType, next.type) + ' does not match expected ' +
-          resolveEnumToken(CssTokenType, type) + ' value';
+      var errorMessage =
+          CssTokenType[next.type] + ' does not match expected ' + CssTokenType[type] + ' value';
 
       if (isPresent(value)) {
         errorMessage += ' ("' + next.strValue + '" should match "' + value + '")';
diff --git a/modules/@angular/compiler/src/output/path_util.ts b/modules/@angular/compiler/src/output/path_util.ts
index f9f762deb44b..aebfb7bbabb2 100644
--- a/modules/@angular/compiler/src/output/path_util.ts
+++ b/modules/@angular/compiler/src/output/path_util.ts
@@ -6,11 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Injectable} from '@angular/core';
-
-import {Math, isBlank, isPresent} from '../facade/lang';
-
-
 // asset:<package-name>/<realm>/<path-to-module>
 var _ASSET_URL_RE = /asset:([^\/]+)\/([^\/]+)\/(.+)/;
 
diff --git a/modules/@angular/compiler/src/view_compiler/view_builder.ts b/modules/@angular/compiler/src/view_compiler/view_builder.ts
index 166b160252aa..8a8c5c846414 100644
--- a/modules/@angular/compiler/src/view_compiler/view_builder.ts
+++ b/modules/@angular/compiler/src/view_compiler/view_builder.ts
@@ -6,14 +6,15 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ChangeDetectionStrategy, ViewEncapsulation} from '@angular/core';
-import {CompileDirectiveMetadata, CompileIdentifierMetadata, CompileTokenMetadata, CompileTypeMetadata} from '../compile_metadata';
-import {ListWrapper, SetWrapper, StringMapWrapper} from '../facade/collection';
+import {ViewEncapsulation} from '@angular/core';
+
+import {CompileDirectiveMetadata, CompileIdentifierMetadata, CompileTokenMetadata} from '../compile_metadata';
+import {ListWrapper, StringMapWrapper} from '../facade/collection';
 import {StringWrapper, isPresent} from '../facade/lang';
-import {Identifiers, identifierToken, resolveIdentifier, resolveIdentifierToken} from '../identifiers';
+import {Identifiers, identifierToken, resolveIdentifier} from '../identifiers';
 import * as o from '../output/output_ast';
 import {ChangeDetectorStatus, ViewType, isDefaultChangeDetectionStrategy} from '../private_import_core';
-import {AttrAst, BoundDirectivePropertyAst, BoundElementPropertyAst, BoundEventAst, BoundTextAst, DirectiveAst, ElementAst, EmbeddedTemplateAst, NgContentAst, ProviderAst, ReferenceAst, TemplateAst, TemplateAstVisitor, TextAst, VariableAst, templateVisitAll} from '../template_parser/template_ast';
+import {AttrAst, BoundDirectivePropertyAst, BoundElementPropertyAst, BoundEventAst, BoundTextAst, DirectiveAst, ElementAst, EmbeddedTemplateAst, NgContentAst, ReferenceAst, TemplateAst, TemplateAstVisitor, TextAst, VariableAst, templateVisitAll} from '../template_parser/template_ast';
 import {createDiTokenExpression} from '../util';
 
 import {CompileElement, CompileNode} from './compile_element';
@@ -596,15 +597,15 @@ function generateDetectChangesMethod(view: CompileView): o.Statement[] {
 
   var varStmts: any[] = [];
   var readVars = o.findReadVarNames(stmts);
-  if (SetWrapper.has(readVars, DetectChangesVars.changed.name)) {
+  if (readVars.has(DetectChangesVars.changed.name)) {
     varStmts.push(DetectChangesVars.changed.set(o.literal(true)).toDeclStmt(o.BOOL_TYPE));
   }
-  if (SetWrapper.has(readVars, DetectChangesVars.changes.name)) {
+  if (readVars.has(DetectChangesVars.changes.name)) {
     varStmts.push(
         DetectChangesVars.changes.set(o.NULL_EXPR)
             .toDeclStmt(new o.MapType(o.importType(resolveIdentifier(Identifiers.SimpleChange)))));
   }
-  if (SetWrapper.has(readVars, DetectChangesVars.valUnwrapper.name)) {
+  if (readVars.has(DetectChangesVars.valUnwrapper.name)) {
     varStmts.push(
         DetectChangesVars.valUnwrapper
             .set(o.importExpr(resolveIdentifier(Identifiers.ValueUnwrapper)).instantiate([]))
diff --git a/modules/@angular/core/src/application_tokens.ts b/modules/@angular/core/src/application_tokens.ts
index 12a7be59ce3b..f41ad681d628 100644
--- a/modules/@angular/core/src/application_tokens.ts
+++ b/modules/@angular/core/src/application_tokens.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Math, StringWrapper} from '../src/facade/lang';
+import {StringWrapper} from '../src/facade/lang';
 
 import {OpaqueToken} from './di';
 
diff --git a/modules/@angular/core/src/reflection/reflector.ts b/modules/@angular/core/src/reflection/reflector.ts
index 024c1222361e..ab045dcdd574 100644
--- a/modules/@angular/core/src/reflection/reflector.ts
+++ b/modules/@angular/core/src/reflection/reflector.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {MapWrapper, SetWrapper, StringMapWrapper} from '../facade/collection';
+import {MapWrapper, StringMapWrapper} from '../facade/collection';
 import {isPresent} from '../facade/lang';
 import {Type} from '../type';
 import {PlatformReflectionCapabilities} from './platform_reflection_capabilities';
@@ -64,7 +64,7 @@ export class Reflector extends ReflectorReader {
       throw new Error('Usage tracking is disabled');
     }
     var allTypes = MapWrapper.keys(this._injectableInfo);
-    return allTypes.filter(key => !SetWrapper.has(this._usedKeys, key));
+    return allTypes.filter(key => !this._usedKeys.has(key));
   }
 
   registerFunction(func: Function, funcInfo: ReflectionInfo): void {
diff --git a/modules/@angular/core/testing/testing_internal.ts b/modules/@angular/core/testing/testing_internal.ts
index 27674f4da415..aa3c86ce7000 100644
--- a/modules/@angular/core/testing/testing_internal.ts
+++ b/modules/@angular/core/testing/testing_internal.ts
@@ -8,9 +8,9 @@
 
 import {AsyncTestCompleter} from './async_test_completer';
 import {StringMapWrapper} from './facade/collection';
-import {Math, global} from './facade/lang';
+import {global} from './facade/lang';
 import {isPromise} from './private_import_core';
-import {TestBed, getTestBed, inject} from './test_bed';
+import {getTestBed, inject} from './test_bed';
 
 export {AsyncTestCompleter} from './async_test_completer';
 export {MockAnimationPlayer} from './mock_animation_player';
diff --git a/modules/@angular/facade/src/browser.ts b/modules/@angular/facade/src/browser.ts
index 8305b9ae442a..c7fd16ee4320 100644
--- a/modules/@angular/facade/src/browser.ts
+++ b/modules/@angular/facade/src/browser.ts
@@ -9,13 +9,13 @@
 /**
  * JS version of browser APIs. This library can only run in the browser.
  */
-var win = typeof window !== 'undefined' && window || <any>{};
+const win = typeof window !== 'undefined' && window || <any>{};
 
 export {win as window};
-export var document = win.document;
-export var location = win.location;
-export var gc = win['gc'] ? () => win['gc']() : (): any => null;
-export var performance = win['performance'] ? win['performance'] : null;
+export const document = win.document;
+export const location = win.location;
+export const gc = win['gc'] ? () => win['gc']() : (): any => null;
+export const performance = win['performance'] ? win['performance'] : null;
 export const Event = win['Event'];
 export const MouseEvent = win['MouseEvent'];
 export const KeyboardEvent = win['KeyboardEvent'];
diff --git a/modules/@angular/facade/src/collection.ts b/modules/@angular/facade/src/collection.ts
index fa4a76070671..6f73771f01c7 100644
--- a/modules/@angular/facade/src/collection.ts
+++ b/modules/@angular/facade/src/collection.ts
@@ -98,10 +98,15 @@ export class MapWrapper {
  * Wraps Javascript Objects
  */
 export class StringMapWrapper {
-  static get<V>(map: {[key: string]: V}, key: string): V {
-    return map.hasOwnProperty(key) ? map[key] : undefined;
+  static create(): {[k: /*any*/ string]: any} {
+    // Note: We are not using Object.create(null) here due to
+    // performance!
+    // http://jsperf.com/ng2-object-create-null
+    return {};
+  }
+  static contains(map: {[key: string]: any}, key: string): boolean {
+    return map.hasOwnProperty(key);
   }
-  static set<V>(map: {[key: string]: V}, key: string, value: V) { map[key] = value; }
 
   static keys(map: {[key: string]: any}): string[] { return Object.keys(map); }
   static values<T>(map: {[key: string]: T}): T[] {
@@ -312,28 +317,4 @@ export function iterateListLike(obj: any, fn: Function) {
       fn(item.value);
     }
   }
-}
-
-// Safari and Internet Explorer do not support the iterable parameter to the
-// Set constructor.  We work around that by manually adding the items.
-var createSetFromList: {(lst: any[]): Set<any>} = (function() {
-  var test = new Set([1, 2, 3]);
-  if (test.size === 3) {
-    return function createSetFromList(lst: any[]): Set<any> { return new Set(lst); };
-  } else {
-    return function createSetAndPopulateFromList(lst: any[]): Set<any> {
-      var res = new Set(lst);
-      if (res.size !== lst.length) {
-        for (var i = 0; i < lst.length; i++) {
-          res.add(lst[i]);
-        }
-      }
-      return res;
-    };
-  }
-})();
-export class SetWrapper {
-  static createFromList<T>(lst: T[]): Set<T> { return createSetFromList(lst); }
-  static has<T>(s: Set<T>, key: T): boolean { return s.has(key); }
-  static delete<K>(m: Set<K>, k: K) { m.delete(k); }
-}
+}
\ No newline at end of file
diff --git a/modules/@angular/facade/src/lang.ts b/modules/@angular/facade/src/lang.ts
index 0d99a2a813db..5cc46d0405ac 100644
--- a/modules/@angular/facade/src/lang.ts
+++ b/modules/@angular/facade/src/lang.ts
@@ -59,16 +59,9 @@ export {_global as global};
 
 
 export function getTypeNameForDebugging(type: any): string {
-  if (type['name']) {
-    return type['name'];
-  }
-  return typeof type;
+  return type['name'] || typeof type;
 }
 
-
-export var Math = _global.Math;
-export var Date = _global.Date;
-
 // TODO: remove calls to assert in production environment
 // Note: Can't just export this and import in in other files
 // as `assert` is a reserved keyword in Dart
@@ -139,24 +132,9 @@ export function stringify(token: any): string {
     return token.name;
   }
 
-  var res = token.toString();
-  var newLineIndex = res.indexOf('\n');
-  return (newLineIndex === -1) ? res : res.substring(0, newLineIndex);
-}
-
-// serialize / deserialize enum exist only for consistency with dart API
-// enums in typescript don't need to be serialized
-
-export function serializeEnum(val: any): number {
-  return val;
-}
-
-export function deserializeEnum(val: any, values: Map<number, any>): any {
-  return val;
-}
-
-export function resolveEnumToken(enumValue: any, val: any): string {
-  return enumValue[val];
+  const res = token.toString();
+  const newLineIndex = res.indexOf('\n');
+  return newLineIndex === -1 ? res : res.substring(0, newLineIndex);
 }
 
 export class StringWrapper {
diff --git a/modules/@angular/facade/test/lang_spec.ts b/modules/@angular/facade/test/lang_spec.ts
index 823cc9ed0b85..3b5137ba485a 100644
--- a/modules/@angular/facade/test/lang_spec.ts
+++ b/modules/@angular/facade/test/lang_spec.ts
@@ -6,12 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NumberWrapper, StringWrapper, escapeRegExp, hasConstructor, isPresent, resolveEnumToken} from '../src/lang';
-
-enum UsefulEnum {
-  MyToken,
-  MyOtherToken
-}
+import {NumberWrapper, StringWrapper, escapeRegExp, hasConstructor} from '../src/lang';
 
 class MySuperclass {}
 class MySubclass extends MySuperclass {}
@@ -135,16 +130,6 @@ export function main() {
       });
     });
 
-    describe('resolveEnumToken', () => {
-      it('should resolve a token given an enum and index values', () => {
-        var token = UsefulEnum.MyToken;
-        expect(resolveEnumToken(UsefulEnum, token)).toEqual('MyToken');
-
-        token = UsefulEnum.MyOtherToken;
-        expect(resolveEnumToken(UsefulEnum, token)).toEqual('MyOtherToken');
-      });
-    });
-
     describe('hasConstructor', () => {
       it('should be true when the type matches',
          () => { expect(hasConstructor(new MySuperclass(), MySuperclass)).toEqual(true); });
diff --git a/modules/@angular/forms/src/form_builder.ts b/modules/@angular/forms/src/form_builder.ts
index 49ff12f56ed6..20015e31570a 100644
--- a/modules/@angular/forms/src/form_builder.ts
+++ b/modules/@angular/forms/src/form_builder.ts
@@ -43,10 +43,8 @@ export class FormBuilder {
    */
   group(controlsConfig: {[key: string]: any}, extra: {[key: string]: any} = null): FormGroup {
     const controls = this._reduceControls(controlsConfig);
-    const validator: ValidatorFn =
-        isPresent(extra) ? StringMapWrapper.get(extra, 'validator') : null;
-    const asyncValidator: AsyncValidatorFn =
-        isPresent(extra) ? StringMapWrapper.get(extra, 'asyncValidator') : null;
+    const validator: ValidatorFn = isPresent(extra) ? extra['validator'] : null;
+    const asyncValidator: AsyncValidatorFn = isPresent(extra) ? extra['asyncValidator'] : null;
     return new FormGroup(controls, validator, asyncValidator);
   }
   /**
diff --git a/modules/@angular/forms/src/model.ts b/modules/@angular/forms/src/model.ts
index 5a9ac3bd0819..26c9c6953151 100644
--- a/modules/@angular/forms/src/model.ts
+++ b/modules/@angular/forms/src/model.ts
@@ -492,7 +492,7 @@ export abstract class AbstractControl {
   getError(errorCode: string, path: string[] = null): any {
     var control = isPresent(path) && !ListWrapper.isEmpty(path) ? this.get(path) : this;
     if (isPresent(control) && isPresent(control._errors)) {
-      return StringMapWrapper.get(control._errors, errorCode);
+      return control._errors[errorCode];
     } else {
       return null;
     }
diff --git a/modules/@angular/http/src/headers.ts b/modules/@angular/http/src/headers.ts
index 1bf2a0842e92..b3c206038a0c 100644
--- a/modules/@angular/http/src/headers.ts
+++ b/modules/@angular/http/src/headers.ts
@@ -6,12 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-
 import {ListWrapper, MapWrapper, StringMapWrapper, isListLikeIterable, iterateListLike} from '../src/facade/collection';
 import {isBlank} from '../src/facade/lang';
 
-
-
 /**
  * Polyfill for [Headers](https://developer.mozilla.org/en-US/docs/Web/API/Headers/Headers), as
  * specified in the [Fetch Spec](https://fetch.spec.whatwg.org/#headers-class).
diff --git a/modules/@angular/http/test/headers_spec.ts b/modules/@angular/http/test/headers_spec.ts
index 72c415fec3fe..91c9b8fb19b1 100644
--- a/modules/@angular/http/test/headers_spec.ts
+++ b/modules/@angular/http/test/headers_spec.ts
@@ -35,7 +35,7 @@ export function main() {
 
     describe('initialization', () => {
       it('should merge values in provided dictionary', () => {
-        var headers = new Headers({'foo': 'bar'});
+        const headers = new Headers({'foo': 'bar'});
         expect(headers.get('foo')).toBe('bar');
         expect(headers.getAll('foo')).toEqual(['bar']);
       });
@@ -52,7 +52,7 @@ export function main() {
 
     describe('.set()', () => {
       it('should clear all values and re-set for the provided key', () => {
-        var headers = new Headers({'foo': 'bar'});
+        const headers = new Headers({'foo': 'bar'});
         expect(headers.get('foo')).toBe('bar');
         expect(headers.getAll('foo')).toEqual(['bar']);
         headers.set('foo', 'baz');
diff --git a/modules/@angular/platform-browser/src/dom/events/key_events.ts b/modules/@angular/platform-browser/src/dom/events/key_events.ts
index d044539c3058..54cff44bcf83 100644
--- a/modules/@angular/platform-browser/src/dom/events/key_events.ts
+++ b/modules/@angular/platform-browser/src/dom/events/key_events.ts
@@ -39,11 +39,10 @@ export class KeyEventsPlugin extends EventManagerPlugin {
     var parsedEvent = KeyEventsPlugin.parseEventName(eventName);
 
     var outsideHandler = KeyEventsPlugin.eventCallback(
-        element, StringMapWrapper.get(parsedEvent, 'fullKey'), handler, this.manager.getZone());
+        element, parsedEvent['fullKey'], handler, this.manager.getZone());
 
     return this.manager.getZone().runOutsideAngular(() => {
-      return getDOM().onAndCancel(
-          element, StringMapWrapper.get(parsedEvent, 'domEventName'), outsideHandler);
+      return getDOM().onAndCancel(element, parsedEvent['domEventName'], outsideHandler);
     });
   }
 
@@ -72,9 +71,10 @@ export class KeyEventsPlugin extends EventManagerPlugin {
       // returning null instead of throwing to let another plugin process the event
       return null;
     }
-    var result = {};
-    StringMapWrapper.set(result, 'domEventName', domEventName);
-    StringMapWrapper.set(result, 'fullKey', fullKey);
+
+    var result: {[k: string]: string} = {};
+    result['domEventName'] = domEventName;
+    result['fullKey'] = fullKey;
     return result;
   }
 
@@ -89,7 +89,7 @@ export class KeyEventsPlugin extends EventManagerPlugin {
     }
     modifierKeys.forEach(modifierName => {
       if (modifierName != key) {
-        var modifierGetter = StringMapWrapper.get(modifierKeyGetters, modifierName);
+        var modifierGetter = modifierKeyGetters[modifierName];
         if (modifierGetter(event)) {
           fullKey += modifierName + '.';
         }
diff --git a/modules/@angular/platform-browser/test/browser_util_spec.ts b/modules/@angular/platform-browser/test/browser_util_spec.ts
index 893b6ffd3588..e8e217921fc8 100644
--- a/modules/@angular/platform-browser/test/browser_util_spec.ts
+++ b/modules/@angular/platform-browser/test/browser_util_spec.ts
@@ -224,17 +224,17 @@ export function main() {
     ];
 
     browsers.forEach((browser: {[key: string]: any}) => {
-      it(`should detect ${StringMapWrapper.get(browser, 'name')}`, () => {
-        var bd = new BrowserDetection(<string>StringMapWrapper.get(browser, 'ua'));
-        expect(bd.isFirefox).toBe(StringMapWrapper.get(browser, 'isFirefox'));
-        expect(bd.isAndroid).toBe(StringMapWrapper.get(browser, 'isAndroid'));
-        expect(bd.isEdge).toBe(StringMapWrapper.get(browser, 'isEdge'));
-        expect(bd.isIE).toBe(StringMapWrapper.get(browser, 'isIE'));
-        expect(bd.isWebkit).toBe(StringMapWrapper.get(browser, 'isWebkit'));
-        expect(bd.isIOS7).toBe(StringMapWrapper.get(browser, 'isIOS7'));
-        expect(bd.isSlow).toBe(StringMapWrapper.get(browser, 'isSlow'));
-        expect(bd.isChromeDesktop).toBe(StringMapWrapper.get(browser, 'isChromeDesktop'));
-        expect(bd.isOldChrome).toBe(StringMapWrapper.get(browser, 'isOldChrome'));
+      it(`should detect ${browser[ 'name']}`, () => {
+        var bd = new BrowserDetection(<string>browser['ua']);
+        expect(bd.isFirefox).toBe(browser['isFirefox']);
+        expect(bd.isAndroid).toBe(browser['isAndroid']);
+        expect(bd.isEdge).toBe(browser['isEdge']);
+        expect(bd.isIE).toBe(browser['isIE']);
+        expect(bd.isWebkit).toBe(browser['isWebkit']);
+        expect(bd.isIOS7).toBe(browser['isIOS7']);
+        expect(bd.isSlow).toBe(browser['isSlow']);
+        expect(bd.isChromeDesktop).toBe(browser['isChromeDesktop']);
+        expect(bd.isOldChrome).toBe(browser['isOldChrome']);
       });
     });
   });
diff --git a/modules/@angular/platform-server/src/parse5_adapter.ts b/modules/@angular/platform-server/src/parse5_adapter.ts
index 59bed8e648d2..c3cad1fec867 100644
--- a/modules/@angular/platform-server/src/parse5_adapter.ts
+++ b/modules/@angular/platform-server/src/parse5_adapter.ts
@@ -146,16 +146,14 @@ export class Parse5DomAdapter extends DomAdapter {
       el: any /** TODO #9100 */, evt: any /** TODO #9100 */,
       listener: any /** TODO #9100 */): Function {
     this.on(el, evt, listener);
-    return () => {
-      ListWrapper.remove(StringMapWrapper.get<any[]>(el._eventListenersMap, evt), listener);
-    };
+    return () => { ListWrapper.remove(<any[]>(el._eventListenersMap[evt]), listener); };
   }
   dispatchEvent(el: any /** TODO #9100 */, evt: any /** TODO #9100 */) {
     if (isBlank(evt.target)) {
       evt.target = el;
     }
     if (isPresent(el._eventListenersMap)) {
-      var listeners: any = StringMapWrapper.get(el._eventListenersMap, evt.type);
+      var listeners: any = el._eventListenersMap[evt.type];
       if (isPresent(listeners)) {
         for (var i = 0; i < listeners.length; i++) {
           listeners[i](evt);
@@ -499,9 +497,9 @@ export class Parse5DomAdapter extends DomAdapter {
     var body = treeAdapter.createElement('body', 'http://www.w3.org/1999/xhtml', []);
     this.appendChild(newDoc, head);
     this.appendChild(newDoc, body);
-    StringMapWrapper.set(newDoc, 'head', head);
-    StringMapWrapper.set(newDoc, 'body', body);
-    StringMapWrapper.set(newDoc, '_window', {});
+    newDoc['head'] = head;
+    newDoc['body'] = body;
+    newDoc['_window'] = StringMapWrapper.create();
     return newDoc;
   }
   defaultDoc(): Document {
@@ -541,32 +539,31 @@ export class Parse5DomAdapter extends DomAdapter {
     for (var i = 0; i < parsedRules.length; i++) {
       var parsedRule = parsedRules[i];
       var rule: {[key: string]: any} = {};
-      StringMapWrapper.set(rule, 'cssText', css);
-      StringMapWrapper.set(rule, 'style', {content: '', cssText: ''});
+      rule['cssText'] = css;
+      rule['style'] = {content: '', cssText: ''};
       if (parsedRule.type == 'rule') {
-        StringMapWrapper.set(rule, 'type', 1);
-        StringMapWrapper.set(
-            rule, 'selectorText', parsedRule.selectors.join(', ')
-                                      .replace(/\s{2,}/g, ' ')
-                                      .replace(/\s*~\s*/g, ' ~ ')
-                                      .replace(/\s*\+\s*/g, ' + ')
-                                      .replace(/\s*>\s*/g, ' > ')
-                                      .replace(/\[(\w+)=(\w+)\]/g, '[$1="$2"]'));
+        rule['type'] = 1;
+
+        rule['selectorText'] =
+            parsedRule.selectors.join(', '.replace(/\s{2,}/g, ' ')
+                                          .replace(/\s*~\s*/g, ' ~ ')
+                                          .replace(/\s*\+\s*/g, ' + ')
+                                          .replace(/\s*>\s*/g, ' > ')
+                                          .replace(/\[(\w+)=(\w+)\]/g, '[$1="$2"]'));
         if (isBlank(parsedRule.declarations)) {
           continue;
         }
         for (var j = 0; j < parsedRule.declarations.length; j++) {
           var declaration = parsedRule.declarations[j];
-          StringMapWrapper.set(
-              StringMapWrapper.get(rule, 'style'), declaration.property, declaration.value);
-          StringMapWrapper.get(rule, 'style').cssText +=
-              declaration.property + ': ' + declaration.value + ';';
+
+          rule['style'] = declaration.property[declaration.value];
+          rule['style'].cssText += declaration.property + ': ' + declaration.value + ';';
         }
       } else if (parsedRule.type == 'media') {
-        StringMapWrapper.set(rule, 'type', 4);
-        StringMapWrapper.set(rule, 'media', {mediaText: parsedRule.media});
+        rule['type'] = 4;
+        rule['media'] = {mediaText: parsedRule.media};
         if (parsedRule.rules) {
-          StringMapWrapper.set(rule, 'cssRules', this._buildRules(parsedRule.rules));
+          rule['cssRules'] = this._buildRules(parsedRule.rules);
         }
       }
       rules.push(rule);
diff --git a/modules/@angular/platform-webworker/src/web_workers/shared/client_message_broker.ts b/modules/@angular/platform-webworker/src/web_workers/shared/client_message_broker.ts
index 361edf67167e..6eaad1cfa39f 100644
--- a/modules/@angular/platform-webworker/src/web_workers/shared/client_message_broker.ts
+++ b/modules/@angular/platform-webworker/src/web_workers/shared/client_message_broker.ts
@@ -150,7 +150,7 @@ class MessageData {
   id: string;
 
   constructor(data: {[key: string]: any}) {
-    this.type = StringMapWrapper.get(data, 'type');
+    this.type = data['type'];
     this.id = this._getValueIfPresent(data, 'id');
     this.value = this._getValueIfPresent(data, 'value');
   }
diff --git a/modules/@angular/platform-webworker/src/web_workers/shared/serializer.ts b/modules/@angular/platform-webworker/src/web_workers/shared/serializer.ts
index 783cdc96b410..17c9ab2e0023 100644
--- a/modules/@angular/platform-webworker/src/web_workers/shared/serializer.ts
+++ b/modules/@angular/platform-webworker/src/web_workers/shared/serializer.ts
@@ -8,7 +8,7 @@
 
 import {Injectable, RenderComponentType, Type, ViewEncapsulation} from '@angular/core';
 
-import {isArray, isPresent, serializeEnum} from '../../facade/lang';
+import {isArray, isPresent} from '../../facade/lang';
 import {VIEW_ENCAPSULATION_VALUES} from '../../private_import_core';
 
 import {RenderStore} from './render_store';
@@ -42,7 +42,7 @@ export class Serializer {
     } else if (type === RenderComponentType) {
       return this._serializeRenderComponentType(obj);
     } else if (type === ViewEncapsulation) {
-      return serializeEnum(obj);
+      return obj;
     } else if (type === LocationType) {
       return this._serializeLocation(obj);
     } else {

From faf5d90bf6ef423195802978ceac97500e25dbd4 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Sun, 18 Sep 2016 16:15:43 -0700
Subject: [PATCH 28/70] refactor: remove dead code

---
 .../compiler/src/private_import_core.ts       |  1 -
 .../src/change_detection/change_detection.ts  |  2 +-
 .../core/src/change_detection/constants.ts    | 19 ------------
 .../@angular/core/src/core_private_export.ts  |  4 ---
 modules/@angular/core/src/metadata/view.ts    |  4 ---
 .../src/private_import_core.ts                |  2 --
 .../src/private_import_core.ts                |  3 --
 .../src/web_workers/shared/serializer.ts      | 31 +++++++++++--------
 8 files changed, 19 insertions(+), 47 deletions(-)

diff --git a/modules/@angular/compiler/src/private_import_core.ts b/modules/@angular/compiler/src/private_import_core.ts
index 86e66c6730d8..8936e825f448 100644
--- a/modules/@angular/compiler/src/private_import_core.ts
+++ b/modules/@angular/compiler/src/private_import_core.ts
@@ -12,7 +12,6 @@ export const isDefaultChangeDetectionStrategy: typeof r.isDefaultChangeDetection
     r.isDefaultChangeDetectionStrategy;
 export type ChangeDetectorStatus = typeof r._ChangeDetectorStatus;
 export const ChangeDetectorStatus: typeof r.ChangeDetectorStatus = r.ChangeDetectorStatus;
-r.CHANGE_DETECTION_STRATEGY_VALUES;
 export type LifecycleHooks = typeof r._LifecycleHooks;
 export const LifecycleHooks: typeof r.LifecycleHooks = r.LifecycleHooks;
 export const LIFECYCLE_HOOKS_VALUES: typeof r.LIFECYCLE_HOOKS_VALUES = r.LIFECYCLE_HOOKS_VALUES;
diff --git a/modules/@angular/core/src/change_detection/change_detection.ts b/modules/@angular/core/src/change_detection/change_detection.ts
index 56f8a265716e..14f8c2de3e43 100644
--- a/modules/@angular/core/src/change_detection/change_detection.ts
+++ b/modules/@angular/core/src/change_detection/change_detection.ts
@@ -14,7 +14,7 @@ import {KeyValueDifferFactory, KeyValueDiffers} from './differs/keyvalue_differs
 export {SimpleChanges} from '../metadata/lifecycle_hooks';
 export {SimpleChange, UNINITIALIZED, ValueUnwrapper, WrappedValue, devModeEqual, looseIdentical} from './change_detection_util';
 export {ChangeDetectorRef} from './change_detector_ref';
-export {CHANGE_DETECTION_STRATEGY_VALUES, ChangeDetectionStrategy, ChangeDetectorStatus, isDefaultChangeDetectionStrategy} from './constants';
+export {ChangeDetectionStrategy, ChangeDetectorStatus, isDefaultChangeDetectionStrategy} from './constants';
 export {CollectionChangeRecord, DefaultIterableDifferFactory} from './differs/default_iterable_differ';
 export {DefaultIterableDiffer} from './differs/default_iterable_differ';
 export {DefaultKeyValueDifferFactory, KeyValueChangeRecord} from './differs/default_keyvalue_differ';
diff --git a/modules/@angular/core/src/change_detection/constants.ts b/modules/@angular/core/src/change_detection/constants.ts
index 3caee2fd47ec..123411c89c4f 100644
--- a/modules/@angular/core/src/change_detection/constants.ts
+++ b/modules/@angular/core/src/change_detection/constants.ts
@@ -66,25 +66,6 @@ export enum ChangeDetectorStatus {
   Destroyed,
 }
 
-/**
- * List of possible {@link ChangeDetectionStrategy} values.
- */
-export var CHANGE_DETECTION_STRATEGY_VALUES = [
-  ChangeDetectionStrategy.OnPush,
-  ChangeDetectionStrategy.Default,
-];
-/**
- * List of possible {@link ChangeDetectorStatus} values.
- */
-export var CHANGE_DETECTOR_STATUS_VALUES = [
-  ChangeDetectorStatus.CheckOnce,
-  ChangeDetectorStatus.Checked,
-  ChangeDetectorStatus.CheckAlways,
-  ChangeDetectorStatus.Detached,
-  ChangeDetectorStatus.Errored,
-  ChangeDetectorStatus.Destroyed,
-];
-
 export function isDefaultChangeDetectionStrategy(changeDetectionStrategy: ChangeDetectionStrategy):
     boolean {
   return isBlank(changeDetectionStrategy) ||
diff --git a/modules/@angular/core/src/core_private_export.ts b/modules/@angular/core/src/core_private_export.ts
index 980ec38066df..6367f7bb3206 100644
--- a/modules/@angular/core/src/core_private_export.ts
+++ b/modules/@angular/core/src/core_private_export.ts
@@ -44,7 +44,6 @@ export var __core_private__: {
   isDefaultChangeDetectionStrategy: typeof constants.isDefaultChangeDetectionStrategy,
   ChangeDetectorStatus: typeof constants.ChangeDetectorStatus,
   _ChangeDetectorStatus?: constants.ChangeDetectorStatus,
-  CHANGE_DETECTION_STRATEGY_VALUES: typeof constants.CHANGE_DETECTION_STRATEGY_VALUES,
   constructDependencies: typeof reflective_provider.constructDependencies,
   LifecycleHooks: typeof lifecycle_hooks.LifecycleHooks,
   _LifecycleHooks?: lifecycle_hooks.LifecycleHooks,
@@ -69,7 +68,6 @@ export var __core_private__: {
   flattenNestedViewRenderNodes: typeof view_utils.flattenNestedViewRenderNodes,
   interpolate: typeof view_utils.interpolate,
   ViewUtils: typeof view_utils.ViewUtils, _ViewUtils?: view_utils.ViewUtils,
-  VIEW_ENCAPSULATION_VALUES: typeof metadata_view.VIEW_ENCAPSULATION_VALUES,
   ViewMetadata: typeof metadata_view.ViewMetadata, _ViewMetadata?: metadata_view.ViewMetadata,
   DebugContext: typeof debug_context.DebugContext, _DebugContext?: debug_context.DebugContext,
   StaticNodeDebugInfo: typeof debug_context.StaticNodeDebugInfo,
@@ -124,7 +122,6 @@ export var __core_private__: {
 } = {
   isDefaultChangeDetectionStrategy: constants.isDefaultChangeDetectionStrategy,
   ChangeDetectorStatus: constants.ChangeDetectorStatus,
-  CHANGE_DETECTION_STRATEGY_VALUES: constants.CHANGE_DETECTION_STRATEGY_VALUES,
   constructDependencies: reflective_provider.constructDependencies,
   LifecycleHooks: lifecycle_hooks.LifecycleHooks,
   LIFECYCLE_HOOKS_VALUES: lifecycle_hooks.LIFECYCLE_HOOKS_VALUES,
@@ -141,7 +138,6 @@ export var __core_private__: {
   flattenNestedViewRenderNodes: view_utils.flattenNestedViewRenderNodes,
   interpolate: view_utils.interpolate,
   ViewUtils: view_utils.ViewUtils,
-  VIEW_ENCAPSULATION_VALUES: metadata_view.VIEW_ENCAPSULATION_VALUES,
   ViewMetadata: metadata_view.ViewMetadata,
   DebugContext: debug_context.DebugContext,
   StaticNodeDebugInfo: debug_context.StaticNodeDebugInfo,
diff --git a/modules/@angular/core/src/metadata/view.ts b/modules/@angular/core/src/metadata/view.ts
index c1e28b8ddd52..bbf962e327d6 100644
--- a/modules/@angular/core/src/metadata/view.ts
+++ b/modules/@angular/core/src/metadata/view.ts
@@ -37,10 +37,6 @@ export enum ViewEncapsulation {
   None
 }
 
-export var VIEW_ENCAPSULATION_VALUES =
-    [ViewEncapsulation.Emulated, ViewEncapsulation.Native, ViewEncapsulation.None];
-
-
 /**
  * Metadata properties available for configuring Views.
  *
diff --git a/modules/@angular/platform-browser/src/private_import_core.ts b/modules/@angular/platform-browser/src/private_import_core.ts
index 9bd81b436036..f2512b86fb14 100644
--- a/modules/@angular/platform-browser/src/private_import_core.ts
+++ b/modules/@angular/platform-browser/src/private_import_core.ts
@@ -12,8 +12,6 @@ export type RenderDebugInfo = typeof r._RenderDebugInfo;
 export var RenderDebugInfo: typeof r.RenderDebugInfo = r.RenderDebugInfo;
 
 export var ReflectionCapabilities: typeof r.ReflectionCapabilities = r.ReflectionCapabilities;
-export var VIEW_ENCAPSULATION_VALUES: typeof r.VIEW_ENCAPSULATION_VALUES =
-    r.VIEW_ENCAPSULATION_VALUES;
 
 export type DebugDomRootRenderer = typeof r._DebugDomRootRenderer;
 export var DebugDomRootRenderer: typeof r.DebugDomRootRenderer = r.DebugDomRootRenderer;
diff --git a/modules/@angular/platform-webworker/src/private_import_core.ts b/modules/@angular/platform-webworker/src/private_import_core.ts
index 48a3322b5dc0..f2512b86fb14 100644
--- a/modules/@angular/platform-webworker/src/private_import_core.ts
+++ b/modules/@angular/platform-webworker/src/private_import_core.ts
@@ -13,9 +13,6 @@ export var RenderDebugInfo: typeof r.RenderDebugInfo = r.RenderDebugInfo;
 
 export var ReflectionCapabilities: typeof r.ReflectionCapabilities = r.ReflectionCapabilities;
 
-export var VIEW_ENCAPSULATION_VALUES: typeof r.VIEW_ENCAPSULATION_VALUES =
-    r.VIEW_ENCAPSULATION_VALUES;
-
 export type DebugDomRootRenderer = typeof r._DebugDomRootRenderer;
 export var DebugDomRootRenderer: typeof r.DebugDomRootRenderer = r.DebugDomRootRenderer;
 export var reflector: typeof r.reflector = r.reflector;
diff --git a/modules/@angular/platform-webworker/src/web_workers/shared/serializer.ts b/modules/@angular/platform-webworker/src/web_workers/shared/serializer.ts
index 17c9ab2e0023..accb8bab1e36 100644
--- a/modules/@angular/platform-webworker/src/web_workers/shared/serializer.ts
+++ b/modules/@angular/platform-webworker/src/web_workers/shared/serializer.ts
@@ -9,7 +9,6 @@
 import {Injectable, RenderComponentType, Type, ViewEncapsulation} from '@angular/core';
 
 import {isArray, isPresent} from '../../facade/lang';
-import {VIEW_ENCAPSULATION_VALUES} from '../../private_import_core';
 
 import {RenderStore} from './render_store';
 import {LocationType} from './serialized_types';
@@ -54,26 +53,32 @@ export class Serializer {
     if (!isPresent(map)) {
       return null;
     }
-    if (isArray(map)) {
-      var obj: any[] = [];
-      (<any[]>map).forEach(val => obj.push(this.deserialize(val, type, data)));
-      return obj;
+
+    if (Array.isArray(map)) {
+      return (<any[]>map).map(val => this.deserialize(val, type, data));
     }
-    if (type == PRIMITIVE) {
+
+    if (type === PRIMITIVE) {
       return map;
     }
 
-    if (type == RenderStoreObject) {
+    if (type === RenderStoreObject) {
       return this._renderStore.deserialize(map);
-    } else if (type === RenderComponentType) {
+    }
+
+    if (type === RenderComponentType) {
       return this._deserializeRenderComponentType(map);
-    } else if (type === ViewEncapsulation) {
-      return VIEW_ENCAPSULATION_VALUES[map];
-    } else if (type === LocationType) {
+    }
+
+    if (type === ViewEncapsulation) {
+      return map as ViewEncapsulation;
+    }
+
+    if (type === LocationType) {
       return this._deserializeLocation(map);
-    } else {
-      throw new Error('No deserializer for ' + type.toString());
     }
+
+    throw new Error('No deserializer for ' + type.toString());
   }
 
   private _serializeLocation(loc: LocationType): Object {

From 51e1994af0222033033359f23f5f00908ca43569 Mon Sep 17 00:00:00 2001
From: vikerman <vikerman@users.noreply.github.com>
Date: Tue, 27 Sep 2016 17:09:44 -0700
Subject: [PATCH 29/70] fix(compiler): Do not embed templateUrl in view
 factories in non-debug mode. (#11818)

Fixes #11117.
---
 .../src/view_compiler/view_builder.ts         | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/modules/@angular/compiler/src/view_compiler/view_builder.ts b/modules/@angular/compiler/src/view_compiler/view_builder.ts
index 8a8c5c846414..71958bc21c30 100644
--- a/modules/@angular/compiler/src/view_compiler/view_builder.ts
+++ b/modules/@angular/compiler/src/view_compiler/view_builder.ts
@@ -514,18 +514,19 @@ function createViewFactory(
   }
   if (view.viewIndex === 0) {
     var animationsExpr = o.literalMap(view.animations.map(entry => [entry.name, entry.fnExp]));
-    initRenderCompTypeStmts = [new o.IfStmt(renderCompTypeVar.identical(o.NULL_EXPR), [
-      renderCompTypeVar
-          .set(ViewConstructorVars.viewUtils.callMethod(
-              'createRenderComponentType',
-              [
-                o.literal(templateUrlInfo),
-                o.literal(view.component.template.ngContentSelectors.length),
-                ViewEncapsulationEnum.fromValue(view.component.template.encapsulation), view.styles,
-                animationsExpr
-              ]))
-          .toStmt()
-    ])];
+    initRenderCompTypeStmts = [new o.IfStmt(
+        renderCompTypeVar.identical(o.NULL_EXPR),
+        [renderCompTypeVar
+             .set(ViewConstructorVars.viewUtils.callMethod(
+                 'createRenderComponentType',
+                 [
+                   view.genConfig.genDebugInfo ? o.literal(templateUrlInfo) : o.literal(''),
+                   o.literal(view.component.template.ngContentSelectors.length),
+                   ViewEncapsulationEnum.fromValue(view.component.template.encapsulation),
+                   view.styles,
+                   animationsExpr,
+                 ]))
+             .toStmt()])];
   }
   return o
       .fn(viewFactoryArgs, initRenderCompTypeStmts.concat([new o.ReturnStatement(

From 5911c3bd431e220e8f6c331b917b727eed3ca9ca Mon Sep 17 00:00:00 2001
From: Marc Laval <mlaval@amadeus.com>
Date: Wed, 28 Sep 2016 02:10:02 +0200
Subject: [PATCH 30/70] fix(compiler): move detection of unsafe properties for
 binding to ElementSchemaRegistry (#11378)

---
 .../src/schema/dom_element_schema_registry.ts |   22 +
 .../src/schema/element_schema_registry.ts     |    2 +
 .../src/template_parser/template_parser.ts    |   22 +-
 .../dom_element_schema_registry_spec.ts       |   41 +
 .../template_parser/template_parser_spec.ts   | 2588 +++++++++--------
 .../compiler/testing/schema_registry_mock.ts  |   22 +-
 .../compiler/testing/test_bindings.ts         |    2 +-
 .../test/linker/security_integration_spec.ts  |    2 +-
 8 files changed, 1409 insertions(+), 1292 deletions(-)

diff --git a/modules/@angular/compiler/src/schema/dom_element_schema_registry.ts b/modules/@angular/compiler/src/schema/dom_element_schema_registry.ts
index 90f83fee1b63..929b1f40aab9 100644
--- a/modules/@angular/compiler/src/schema/dom_element_schema_registry.ts
+++ b/modules/@angular/compiler/src/schema/dom_element_schema_registry.ts
@@ -344,4 +344,26 @@ export class DomElementSchemaRegistry extends ElementSchemaRegistry {
   getMappedPropName(propName: string): string { return _ATTR_TO_PROP[propName] || propName; }
 
   getDefaultComponentElementName(): string { return 'ng-component'; }
+
+  validateProperty(name: string): {error: boolean, msg?: string} {
+    if (name.toLowerCase().startsWith('on')) {
+      const msg = `Binding to event property '${name}' is disallowed for security reasons, ` +
+          `please use (${name.slice(2)})=...` +
+          `\nIf '${name}' is a directive input, make sure the directive is imported by the` +
+          ` current module.`;
+      return {error: true, msg: msg};
+    } else {
+      return {error: false};
+    }
+  }
+
+  validateAttribute(name: string): {error: boolean, msg?: string} {
+    if (name.toLowerCase().startsWith('on')) {
+      const msg = `Binding to event attribute '${name}' is disallowed for security reasons, ` +
+          `please use (${name.slice(2)})=...`;
+      return {error: true, msg: msg};
+    } else {
+      return {error: false};
+    }
+  }
 }
diff --git a/modules/@angular/compiler/src/schema/element_schema_registry.ts b/modules/@angular/compiler/src/schema/element_schema_registry.ts
index b16428f9e372..52ed080d9680 100644
--- a/modules/@angular/compiler/src/schema/element_schema_registry.ts
+++ b/modules/@angular/compiler/src/schema/element_schema_registry.ts
@@ -14,4 +14,6 @@ export abstract class ElementSchemaRegistry {
   abstract securityContext(tagName: string, propName: string): any;
   abstract getMappedPropName(propName: string): string;
   abstract getDefaultComponentElementName(): string;
+  abstract validateProperty(name: string): {error: boolean, msg?: string};
+  abstract validateAttribute(name: string): {error: boolean, msg?: string};
 }
diff --git a/modules/@angular/compiler/src/template_parser/template_parser.ts b/modules/@angular/compiler/src/template_parser/template_parser.ts
index 62adb99bcd0d..1f3c58fee3fd 100644
--- a/modules/@angular/compiler/src/template_parser/template_parser.ts
+++ b/modules/@angular/compiler/src/template_parser/template_parser.ts
@@ -927,7 +927,7 @@ class TemplateParseVisitor implements html.Visitor {
         boundPropertyName = this._schemaRegistry.getMappedPropName(partValue);
         securityContext = this._schemaRegistry.securityContext(elementName, boundPropertyName);
         bindingType = PropertyBindingType.Property;
-        this._assertNoEventBinding(boundPropertyName, sourceSpan, false);
+        this._validatePropertyOrAttributeName(boundPropertyName, sourceSpan, false);
         if (!this._schemaRegistry.hasProperty(elementName, boundPropertyName, this._schemas)) {
           let errorMsg =
               `Can't bind to '${boundPropertyName}' since it isn't a known property of '${elementName}'.`;
@@ -942,7 +942,7 @@ class TemplateParseVisitor implements html.Visitor {
     } else {
       if (parts[0] == ATTRIBUTE_PREFIX) {
         boundPropertyName = parts[1];
-        this._assertNoEventBinding(boundPropertyName, sourceSpan, true);
+        this._validatePropertyOrAttributeName(boundPropertyName, sourceSpan, true);
         // NB: For security purposes, use the mapped property name, not the attribute name.
         const mapPropName = this._schemaRegistry.getMappedPropName(boundPropertyName);
         securityContext = this._schemaRegistry.securityContext(elementName, mapPropName);
@@ -975,23 +975,19 @@ class TemplateParseVisitor implements html.Visitor {
         boundPropertyName, bindingType, securityContext, ast, unit, sourceSpan);
   }
 
+
   /**
    * @param propName the name of the property / attribute
    * @param sourceSpan
    * @param isAttr true when binding to an attribute
    * @private
    */
-  private _assertNoEventBinding(propName: string, sourceSpan: ParseSourceSpan, isAttr: boolean):
-      void {
-    if (propName.toLowerCase().startsWith('on')) {
-      let msg = `Binding to event attribute '${propName}' is disallowed for security reasons, ` +
-          `please use (${propName.slice(2)})=...`;
-      if (!isAttr) {
-        msg +=
-            `\nIf '${propName}' is a directive input, make sure the directive is imported by the` +
-            ` current module.`;
-      }
-      this._reportError(msg, sourceSpan, ParseErrorLevel.FATAL);
+  private _validatePropertyOrAttributeName(
+      propName: string, sourceSpan: ParseSourceSpan, isAttr: boolean): void {
+    const report = isAttr ? this._schemaRegistry.validateAttribute(propName) :
+                            this._schemaRegistry.validateProperty(propName);
+    if (report.error) {
+      this._reportError(report.msg, sourceSpan, ParseErrorLevel.FATAL);
     }
   }
 
diff --git a/modules/@angular/compiler/test/schema/dom_element_schema_registry_spec.ts b/modules/@angular/compiler/test/schema/dom_element_schema_registry_spec.ts
index 4e4ecbce43bb..6ac675beb112 100644
--- a/modules/@angular/compiler/test/schema/dom_element_schema_registry_spec.ts
+++ b/modules/@angular/compiler/test/schema/dom_element_schema_registry_spec.ts
@@ -105,6 +105,47 @@ export function main() {
       expect(registry.getMappedPropName('exotic-unknown')).toEqual('exotic-unknown');
     });
 
+    it('should return an error message when asserting event properties', () => {
+      let report = registry.validateProperty('onClick');
+      expect(report.error).toBeTruthy();
+      expect(report.msg)
+          .toEqual(
+              `Binding to event property 'onClick' is disallowed for security reasons, please use (Click)=...
+If 'onClick' is a directive input, make sure the directive is imported by the current module.`);
+
+      report = registry.validateProperty('onAnything');
+      expect(report.error).toBeTruthy();
+      expect(report.msg)
+          .toEqual(
+              `Binding to event property 'onAnything' is disallowed for security reasons, please use (Anything)=...
+If 'onAnything' is a directive input, make sure the directive is imported by the current module.`);
+    });
+
+    it('should return an error message when asserting event attributes', () => {
+      let report = registry.validateAttribute('onClick');
+      expect(report.error).toBeTruthy();
+      expect(report.msg)
+          .toEqual(
+              `Binding to event attribute 'onClick' is disallowed for security reasons, please use (Click)=...`);
+
+      report = registry.validateAttribute('onAnything');
+      expect(report.error).toBeTruthy();
+      expect(report.msg)
+          .toEqual(
+              `Binding to event attribute 'onAnything' is disallowed for security reasons, please use (Anything)=...`);
+    });
+
+    it('should not return an error message when asserting non-event properties or attributes',
+       () => {
+         let report = registry.validateProperty('title');
+         expect(report.error).toBeFalsy();
+         expect(report.msg).not.toBeDefined();
+
+         report = registry.validateProperty('exotic-unknown');
+         expect(report.error).toBeFalsy();
+         expect(report.msg).not.toBeDefined();
+       });
+
     it('should return security contexts for elements', () => {
       expect(registry.securityContext('iframe', 'srcdoc')).toBe(SecurityContext.HTML);
       expect(registry.securityContext('p', 'innerHTML')).toBe(SecurityContext.HTML);
diff --git a/modules/@angular/compiler/test/template_parser/template_parser_spec.ts b/modules/@angular/compiler/test/template_parser/template_parser_spec.ts
index dceedebcd4b3..c477a4f542ab 100644
--- a/modules/@angular/compiler/test/template_parser/template_parser_spec.ts
+++ b/modules/@angular/compiler/test/template_parser/template_parser_spec.ts
@@ -26,7 +26,8 @@ const someModuleUrl = 'package:someModule';
 const MOCK_SCHEMA_REGISTRY = [{
   provide: ElementSchemaRegistry,
   useValue: new MockSchemaRegistry(
-      {'invalidProp': false}, {'mappedAttr': 'mappedProp'}, {'unknown': false, 'un-known': false}),
+      {'invalidProp': false}, {'mappedAttr': 'mappedProp'}, {'unknown': false, 'un-known': false},
+      ['onEvent'], ['onEvent']),
 }];
 
 export function main() {
@@ -141,1494 +142,1529 @@ export function main() {
     });
   });
 
-  describe('TemplateParser', () => {
-    beforeEach(() => {
-      TestBed.configureCompiler({providers: [TEST_COMPILER_PROVIDERS, MOCK_SCHEMA_REGISTRY]});
-    });
+  describe(
+      'TemplateParser', () => {
+        beforeEach(() => {
+          TestBed.configureCompiler({providers: [TEST_COMPILER_PROVIDERS, MOCK_SCHEMA_REGISTRY]});
+        });
 
-    commonBeforeEach();
+        commonBeforeEach();
 
-    describe('parse', () => {
-      describe('nodes without bindings', () => {
+        describe('parse', () => {
+          describe('nodes without bindings', () => {
 
-        it('should parse text nodes', () => {
-          expect(humanizeTplAst(parse('a', []))).toEqual([[TextAst, 'a']]);
-        });
+            it('should parse text nodes', () => {
+              expect(humanizeTplAst(parse('a', []))).toEqual([[TextAst, 'a']]);
+            });
 
-        it('should parse elements with attributes', () => {
-          expect(humanizeTplAst(parse('<div a=b>', [
-          ]))).toEqual([[ElementAst, 'div'], [AttrAst, 'a', 'b']]);
-        });
-      });
+            it('should parse elements with attributes', () => {
+              expect(humanizeTplAst(parse('<div a=b>', [
+              ]))).toEqual([[ElementAst, 'div'], [AttrAst, 'a', 'b']]);
+            });
+          });
 
-      it('should parse ngContent', () => {
-        var parsed = parse('<ng-content select="a">', []);
-        expect(humanizeTplAst(parsed)).toEqual([[NgContentAst]]);
-      });
+          it('should parse ngContent', () => {
+            var parsed = parse('<ng-content select="a">', []);
+            expect(humanizeTplAst(parsed)).toEqual([[NgContentAst]]);
+          });
 
-      it('should parse ngContent regardless the namespace', () => {
-        var parsed = parse('<svg><ng-content></ng-content></svg>', []);
-        expect(humanizeTplAst(parsed)).toEqual([
-          [ElementAst, ':svg:svg'],
-          [NgContentAst],
-        ]);
-      });
+          it('should parse ngContent regardless the namespace', () => {
+            var parsed = parse('<svg><ng-content></ng-content></svg>', []);
+            expect(humanizeTplAst(parsed)).toEqual([
+              [ElementAst, ':svg:svg'],
+              [NgContentAst],
+            ]);
+          });
 
-      it('should parse bound text nodes', () => {
-        expect(humanizeTplAst(parse('{{a}}', []))).toEqual([[BoundTextAst, '{{ a }}']]);
-      });
+          it('should parse bound text nodes', () => {
+            expect(humanizeTplAst(parse('{{a}}', []))).toEqual([[BoundTextAst, '{{ a }}']]);
+          });
 
-      it('should parse with custom interpolation config',
-         inject([TemplateParser], (parser: TemplateParser) => {
-           const component = CompileDirectiveMetadata.create({
-             selector: 'test',
-             type: new CompileTypeMetadata(
-                 {moduleUrl: someModuleUrl, name: 'Test', reference: {} as Type<any>}),
-             isComponent: true,
-             template: new CompileTemplateMetadata({interpolation: ['{%', '%}']})
-           });
-           expect(humanizeTplAst(parser.parse(component, '{%a%}', [], [], [], 'TestComp'), {
-             start: '{%',
-             end: '%}'
-           })).toEqual([[BoundTextAst, '{% a %}']]);
-         }));
-
-      describe('bound properties', () => {
-
-        it('should parse mixed case bound properties', () => {
-          expect(humanizeTplAst(parse('<div [someProp]="v">', []))).toEqual([
-            [ElementAst, 'div'],
-            [BoundElementPropertyAst, PropertyBindingType.Property, 'someProp', 'v', null]
-          ]);
-        });
+          it('should parse with custom interpolation config',
+             inject([TemplateParser], (parser: TemplateParser) => {
+               const component = CompileDirectiveMetadata.create({
+                 selector: 'test',
+                 type: new CompileTypeMetadata(
+                     {moduleUrl: someModuleUrl, name: 'Test', reference: {} as Type<any>}),
+                 isComponent: true,
+                 template: new CompileTemplateMetadata({interpolation: ['{%', '%}']})
+               });
+               expect(humanizeTplAst(parser.parse(component, '{%a%}', [], [], [], 'TestComp'), {
+                 start: '{%',
+                 end: '%}'
+               })).toEqual([[BoundTextAst, '{% a %}']]);
+             }));
+
+          describe('bound properties', () => {
+
+            it('should parse mixed case bound properties', () => {
+              expect(humanizeTplAst(parse('<div [someProp]="v">', []))).toEqual([
+                [ElementAst, 'div'],
+                [BoundElementPropertyAst, PropertyBindingType.Property, 'someProp', 'v', null]
+              ]);
+            });
 
-        it('should parse dash case bound properties', () => {
-          expect(humanizeTplAst(parse('<div [some-prop]="v">', []))).toEqual([
-            [ElementAst, 'div'],
-            [BoundElementPropertyAst, PropertyBindingType.Property, 'some-prop', 'v', null]
-          ]);
-        });
+            it('should parse dash case bound properties', () => {
+              expect(humanizeTplAst(parse('<div [some-prop]="v">', []))).toEqual([
+                [ElementAst, 'div'],
+                [BoundElementPropertyAst, PropertyBindingType.Property, 'some-prop', 'v', null]
+              ]);
+            });
 
-        it('should normalize property names via the element schema', () => {
-          expect(humanizeTplAst(parse('<div [mappedAttr]="v">', []))).toEqual([
-            [ElementAst, 'div'],
-            [BoundElementPropertyAst, PropertyBindingType.Property, 'mappedProp', 'v', null]
-          ]);
-        });
+            it('should normalize property names via the element schema', () => {
+              expect(humanizeTplAst(parse('<div [mappedAttr]="v">', []))).toEqual([
+                [ElementAst, 'div'],
+                [BoundElementPropertyAst, PropertyBindingType.Property, 'mappedProp', 'v', null]
+              ]);
+            });
 
-        it('should parse mixed case bound attributes', () => {
-          expect(humanizeTplAst(parse('<div [attr.someAttr]="v">', []))).toEqual([
-            [ElementAst, 'div'],
-            [BoundElementPropertyAst, PropertyBindingType.Attribute, 'someAttr', 'v', null]
-          ]);
-        });
+            it('should parse mixed case bound attributes', () => {
+              expect(humanizeTplAst(parse('<div [attr.someAttr]="v">', []))).toEqual([
+                [ElementAst, 'div'],
+                [BoundElementPropertyAst, PropertyBindingType.Attribute, 'someAttr', 'v', null]
+              ]);
+            });
 
-        it('should parse and dash case bound classes', () => {
-          expect(humanizeTplAst(parse('<div [class.some-class]="v">', []))).toEqual([
-            [ElementAst, 'div'],
-            [BoundElementPropertyAst, PropertyBindingType.Class, 'some-class', 'v', null]
-          ]);
-        });
+            it('should parse and dash case bound classes', () => {
+              expect(humanizeTplAst(parse('<div [class.some-class]="v">', []))).toEqual([
+                [ElementAst, 'div'],
+                [BoundElementPropertyAst, PropertyBindingType.Class, 'some-class', 'v', null]
+              ]);
+            });
 
-        it('should parse mixed case bound classes', () => {
-          expect(humanizeTplAst(parse('<div [class.someClass]="v">', []))).toEqual([
-            [ElementAst, 'div'],
-            [BoundElementPropertyAst, PropertyBindingType.Class, 'someClass', 'v', null]
-          ]);
-        });
+            it('should parse mixed case bound classes', () => {
+              expect(humanizeTplAst(parse('<div [class.someClass]="v">', []))).toEqual([
+                [ElementAst, 'div'],
+                [BoundElementPropertyAst, PropertyBindingType.Class, 'someClass', 'v', null]
+              ]);
+            });
 
-        it('should parse mixed case bound styles', () => {
-          expect(humanizeTplAst(parse('<div [style.someStyle]="v">', []))).toEqual([
-            [ElementAst, 'div'],
-            [BoundElementPropertyAst, PropertyBindingType.Style, 'someStyle', 'v', null]
-          ]);
-        });
+            it('should parse mixed case bound styles', () => {
+              expect(humanizeTplAst(parse('<div [style.someStyle]="v">', []))).toEqual([
+                [ElementAst, 'div'],
+                [BoundElementPropertyAst, PropertyBindingType.Style, 'someStyle', 'v', null]
+              ]);
+            });
 
-        it('should report invalid prefixes', () => {
-          expect(() => parse('<p [atTr.foo]>', []))
-              .toThrowError(
-                  `Template parse errors:\nInvalid property name 'atTr.foo' ("<p [ERROR ->][atTr.foo]>"): TestComp@0:3`);
-          expect(() => parse('<p [sTyle.foo]>', []))
-              .toThrowError(
-                  `Template parse errors:\nInvalid property name 'sTyle.foo' ("<p [ERROR ->][sTyle.foo]>"): TestComp@0:3`);
-          expect(() => parse('<p [Class.foo]>', []))
-              .toThrowError(
-                  `Template parse errors:\nInvalid property name 'Class.foo' ("<p [ERROR ->][Class.foo]>"): TestComp@0:3`);
-          expect(() => parse('<p [bar.foo]>', []))
-              .toThrowError(
-                  `Template parse errors:\nInvalid property name 'bar.foo' ("<p [ERROR ->][bar.foo]>"): TestComp@0:3`);
-        });
+            it('should report invalid prefixes', () => {
+              expect(() => parse('<p [atTr.foo]>', []))
+                  .toThrowError(
+                      `Template parse errors:\nInvalid property name 'atTr.foo' ("<p [ERROR ->][atTr.foo]>"): TestComp@0:3`);
+              expect(() => parse('<p [sTyle.foo]>', []))
+                  .toThrowError(
+                      `Template parse errors:\nInvalid property name 'sTyle.foo' ("<p [ERROR ->][sTyle.foo]>"): TestComp@0:3`);
+              expect(() => parse('<p [Class.foo]>', []))
+                  .toThrowError(
+                      `Template parse errors:\nInvalid property name 'Class.foo' ("<p [ERROR ->][Class.foo]>"): TestComp@0:3`);
+              expect(() => parse('<p [bar.foo]>', []))
+                  .toThrowError(
+                      `Template parse errors:\nInvalid property name 'bar.foo' ("<p [ERROR ->][bar.foo]>"): TestComp@0:3`);
+            });
 
-        describe('errors', () => {
-          it('should throw error when binding to an unknown property', () => {
-            expect(() => parse('<my-component [invalidProp]="bar"></my-component>', []))
-                .toThrowError(`Template parse errors:
+            describe('errors', () => {
+              it('should throw error when binding to an unknown property', () => {
+                expect(() => parse('<my-component [invalidProp]="bar"></my-component>', []))
+                    .toThrowError(`Template parse errors:
 Can't bind to 'invalidProp' since it isn't a known property of 'my-component'.
 1. If 'my-component' is an Angular component and it has 'invalidProp' input, then verify that it is part of this module.
 2. If 'my-component' is a Web Component then add "CUSTOM_ELEMENTS_SCHEMA" to the '@NgModule.schemas' of this component to suppress this message.
  ("<my-component [ERROR ->][invalidProp]="bar"></my-component>"): TestComp@0:14`);
-          });
+              });
 
-          it('should throw error when binding to an unknown element w/o bindings', () => {
-            expect(() => parse('<unknown></unknown>', [])).toThrowError(`Template parse errors:
+              it('should throw error when binding to an unknown element w/o bindings', () => {
+                expect(() => parse('<unknown></unknown>', [])).toThrowError(`Template parse errors:
 'unknown' is not a known element:
 1. If 'unknown' is an Angular component, then verify that it is part of this module.
 2. If 'unknown' is a Web Component then add "CUSTOM_ELEMENTS_SCHEMA" to the '@NgModule.schemas' of this component to suppress this message. ("[ERROR ->]<unknown></unknown>"): TestComp@0:0`);
-          });
+              });
 
-          it('should throw error when binding to an unknown custom element w/o bindings', () => {
-            expect(() => parse('<un-known></un-known>', [])).toThrowError(`Template parse errors:
+              it('should throw error when binding to an unknown custom element w/o bindings',
+                 () => {
+                   expect(() => parse('<un-known></un-known>', []))
+                       .toThrowError(`Template parse errors:
 'un-known' is not a known element:
 1. If 'un-known' is an Angular component, then verify that it is part of this module.
 2. If 'un-known' is a Web Component then add "CUSTOM_ELEMENTS_SCHEMA" to the '@NgModule.schemas' of this component to suppress this message. ("[ERROR ->]<un-known></un-known>"): TestComp@0:0`);
-          });
-        });
-
-        it('should parse bound properties via [...] and not report them as attributes', () => {
-          expect(humanizeTplAst(parse('<div [prop]="v">', []))).toEqual([
-            [ElementAst, 'div'],
-            [BoundElementPropertyAst, PropertyBindingType.Property, 'prop', 'v', null]
-          ]);
-        });
+                 });
+
+              it('should throw error when binding to an invalid property', () => {
+                expect(() => parse('<my-component [onEvent]="bar"></my-component>', []))
+                    .toThrowError(`Template parse errors:
+Binding to property 'onEvent' is disallowed for security reasons ("<my-component [ERROR ->][onEvent]="bar"></my-component>"): TestComp@0:14`);
+              });
+
+              it('should throw error when binding to an invalid attribute', () => {
+                expect(() => parse('<my-component [attr.onEvent]="bar"></my-component>', []))
+                    .toThrowError(`Template parse errors:
+Binding to attribute 'onEvent' is disallowed for security reasons ("<my-component [ERROR ->][attr.onEvent]="bar"></my-component>"): TestComp@0:14`);
+              });
+            });
 
-        it('should parse bound properties via bind- and not report them as attributes', () => {
-          expect(humanizeTplAst(parse('<div bind-prop="v">', []))).toEqual([
-            [ElementAst, 'div'],
-            [BoundElementPropertyAst, PropertyBindingType.Property, 'prop', 'v', null]
-          ]);
-        });
+            it('should parse bound properties via [...] and not report them as attributes', () => {
+              expect(humanizeTplAst(parse('<div [prop]="v">', []))).toEqual([
+                [ElementAst, 'div'],
+                [BoundElementPropertyAst, PropertyBindingType.Property, 'prop', 'v', null]
+              ]);
+            });
 
-        it('should parse bound properties via {{...}} and not report them as attributes', () => {
-          expect(humanizeTplAst(parse('<div prop="{{v}}">', []))).toEqual([
-            [ElementAst, 'div'],
-            [BoundElementPropertyAst, PropertyBindingType.Property, 'prop', '{{ v }}', null]
-          ]);
-        });
+            it('should parse bound properties via bind- and not report them as attributes', () => {
+              expect(humanizeTplAst(parse('<div bind-prop="v">', []))).toEqual([
+                [ElementAst, 'div'],
+                [BoundElementPropertyAst, PropertyBindingType.Property, 'prop', 'v', null]
+              ]);
+            });
 
-        it('should parse bound properties via bind-animate- and not report them as attributes',
-           () => {
-             expect(humanizeTplAst(parse('<div bind-animate-someAnimation="value2">', [], [], [])))
-                 .toEqual([
+            it('should parse bound properties via {{...}} and not report them as attributes',
+               () => {
+                 expect(humanizeTplAst(parse('<div prop="{{v}}">', []))).toEqual([
                    [ElementAst, 'div'],
                    [
-                     BoundElementPropertyAst, PropertyBindingType.Animation, 'someAnimation',
-                     'value2', null
+                     BoundElementPropertyAst, PropertyBindingType.Property, 'prop', '{{ v }}', null
                    ]
                  ]);
-           });
-
-        it('should throw an error when parsing detects non-bound properties via @ that contain a value',
-           () => {
-             expect(() => { parse('<div @someAnimation="value2">', [], [], []); })
-                 .toThrowError(
-                     /Assigning animation triggers via @prop="exp" attributes with an expression is invalid. Use property bindings \(e.g. \[@prop\]="exp"\) or use an attribute without a value \(e.g. @prop\) instead. \("<div \[ERROR ->\]@someAnimation="value2">"\): TestComp@0:5/);
-           });
-
-        it('should not issue a warning when host attributes contain a valid property-bound animation trigger',
-           () => {
-             const animationEntries = [new CompileAnimationEntryMetadata('prop', [])];
-             var dirA = CompileDirectiveMetadata.create({
-               selector: 'div',
-               template: new CompileTemplateMetadata({animations: animationEntries}),
-               type: new CompileTypeMetadata(
-                   {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>}),
-               host: {'[@prop]': 'expr'}
-             });
-
-             humanizeTplAst(parse('<div></div>', [dirA]));
-             expect(console.warnings.length).toEqual(0);
-           });
-
-        it('should throw descriptive error when a host binding is not a string expression', () => {
-          var dirA = CompileDirectiveMetadata.create({
-            selector: 'broken',
-            type: new CompileTypeMetadata(
-                {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>}),
-            host: {'[class.foo]': null}
-          });
+               });
+
+            it('should parse bound properties via bind-animate- and not report them as attributes',
+               () => {
+                 expect(
+                     humanizeTplAst(parse('<div bind-animate-someAnimation="value2">', [], [], [])))
+                     .toEqual([
+                       [ElementAst, 'div'],
+                       [
+                         BoundElementPropertyAst, PropertyBindingType.Animation, 'someAnimation',
+                         'value2', null
+                       ]
+                     ]);
+               });
+
+            it('should throw an error when parsing detects non-bound properties via @ that contain a value',
+               () => {
+                 expect(() => { parse('<div @someAnimation="value2">', [], [], []); })
+                     .toThrowError(
+                         /Assigning animation triggers via @prop="exp" attributes with an expression is invalid. Use property bindings \(e.g. \[@prop\]="exp"\) or use an attribute without a value \(e.g. @prop\) instead. \("<div \[ERROR ->\]@someAnimation="value2">"\): TestComp@0:5/);
+               });
+
+            it('should not issue a warning when host attributes contain a valid property-bound animation trigger',
+               () => {
+                 const animationEntries = [new CompileAnimationEntryMetadata('prop', [])];
+                 var dirA = CompileDirectiveMetadata.create({
+                   selector: 'div',
+                   template: new CompileTemplateMetadata({animations: animationEntries}),
+                   type: new CompileTypeMetadata(
+                       {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>}),
+                   host: {'[@prop]': 'expr'}
+                 });
+
+                 humanizeTplAst(parse('<div></div>', [dirA]));
+                 expect(console.warnings.length).toEqual(0);
+               });
+
+            it('should throw descriptive error when a host binding is not a string expression', () => {
+              var dirA = CompileDirectiveMetadata.create({
+                selector: 'broken',
+                type: new CompileTypeMetadata(
+                    {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>}),
+                host: {'[class.foo]': null}
+              });
+
+              expect(() => { parse('<broken></broken>', [dirA]); })
+                  .toThrowError(
+                      `Template parse errors:\nValue of the host property binding "class.foo" needs to be a string representing an expression but got "null" (object) ("[ERROR ->]<broken></broken>"): TestComp@0:0, Directive DirA`);
+            });
 
-          expect(() => { parse('<broken></broken>', [dirA]); })
-              .toThrowError(
-                  `Template parse errors:\nValue of the host property binding "class.foo" needs to be a string representing an expression but got "null" (object) ("[ERROR ->]<broken></broken>"): TestComp@0:0, Directive DirA`);
-        });
+            it('should throw descriptive error when a host event is not a string expression', () => {
+              var dirA = CompileDirectiveMetadata.create({
+                selector: 'broken',
+                type: new CompileTypeMetadata(
+                    {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>}),
+                host: {'(click)': null}
+              });
+
+              expect(() => { parse('<broken></broken>', [dirA]); })
+                  .toThrowError(
+                      `Template parse errors:\nValue of the host listener "click" needs to be a string representing an expression but got "null" (object) ("[ERROR ->]<broken></broken>"): TestComp@0:0, Directive DirA`);
+            });
 
-        it('should throw descriptive error when a host event is not a string expression', () => {
-          var dirA = CompileDirectiveMetadata.create({
-            selector: 'broken',
-            type: new CompileTypeMetadata(
-                {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>}),
-            host: {'(click)': null}
+            it('should not issue a warning when an animation property is bound without an expression',
+               () => {
+                 humanizeTplAst(parse('<div @someAnimation>', [], [], []));
+                 expect(console.warnings.length).toEqual(0);
+               });
+
+            it('should parse bound properties via [@] and not report them as attributes', () => {
+              expect(humanizeTplAst(parse('<div [@someAnimation]="value2">', [], [], []))).toEqual([
+                [ElementAst, 'div'],
+                [
+                  BoundElementPropertyAst, PropertyBindingType.Animation, 'someAnimation', 'value2',
+                  null
+                ]
+              ]);
+            });
           });
 
-          expect(() => { parse('<broken></broken>', [dirA]); })
-              .toThrowError(
-                  `Template parse errors:\nValue of the host listener "click" needs to be a string representing an expression but got "null" (object) ("[ERROR ->]<broken></broken>"): TestComp@0:0, Directive DirA`);
-        });
+          describe('events', () => {
 
-        it('should not issue a warning when an animation property is bound without an expression',
-           () => {
-             humanizeTplAst(parse('<div @someAnimation>', [], [], []));
-             expect(console.warnings.length).toEqual(0);
-           });
-
-        it('should parse bound properties via [@] and not report them as attributes', () => {
-          expect(humanizeTplAst(parse('<div [@someAnimation]="value2">', [], [], []))).toEqual([
-            [ElementAst, 'div'],
-            [
-              BoundElementPropertyAst, PropertyBindingType.Animation, 'someAnimation', 'value2',
-              null
-            ]
-          ]);
-        });
-      });
-
-      describe('events', () => {
-
-        it('should parse bound events with a target', () => {
-          expect(humanizeTplAst(parse('<div (window:event)="v">', []))).toEqual([
-            [ElementAst, 'div'],
-            [BoundEventAst, 'event', 'window', 'v'],
-          ]);
-        });
+            it('should parse bound events with a target', () => {
+              expect(humanizeTplAst(parse('<div (window:event)="v">', []))).toEqual([
+                [ElementAst, 'div'],
+                [BoundEventAst, 'event', 'window', 'v'],
+              ]);
+            });
 
-        it('should report an error on empty expression', () => {
-          expect(() => parse('<div (event)="">', []))
-              .toThrowError(/Empty expressions are not allowed/);
+            it('should report an error on empty expression', () => {
+              expect(() => parse('<div (event)="">', []))
+                  .toThrowError(/Empty expressions are not allowed/);
 
-          expect(() => parse('<div (event)="  ">', []))
-              .toThrowError(/Empty expressions are not allowed/);
-        });
+              expect(() => parse('<div (event)="  ">', []))
+                  .toThrowError(/Empty expressions are not allowed/);
+            });
 
-        it('should parse bound events via (...) and not report them as attributes', () => {
-          expect(humanizeTplAst(parse('<div (event)="v">', [
-          ]))).toEqual([[ElementAst, 'div'], [BoundEventAst, 'event', null, 'v']]);
-        });
+            it('should parse bound events via (...) and not report them as attributes', () => {
+              expect(humanizeTplAst(parse('<div (event)="v">', [
+              ]))).toEqual([[ElementAst, 'div'], [BoundEventAst, 'event', null, 'v']]);
+            });
 
-        it('should parse event names case sensitive', () => {
-          expect(humanizeTplAst(parse('<div (some-event)="v">', [
-          ]))).toEqual([[ElementAst, 'div'], [BoundEventAst, 'some-event', null, 'v']]);
-          expect(humanizeTplAst(parse('<div (someEvent)="v">', [
-          ]))).toEqual([[ElementAst, 'div'], [BoundEventAst, 'someEvent', null, 'v']]);
-        });
+            it('should parse event names case sensitive', () => {
+              expect(humanizeTplAst(parse('<div (some-event)="v">', [
+              ]))).toEqual([[ElementAst, 'div'], [BoundEventAst, 'some-event', null, 'v']]);
+              expect(humanizeTplAst(parse('<div (someEvent)="v">', [
+              ]))).toEqual([[ElementAst, 'div'], [BoundEventAst, 'someEvent', null, 'v']]);
+            });
 
-        it('should parse bound events via on- and not report them as attributes', () => {
-          expect(humanizeTplAst(parse('<div on-event="v">', [
-          ]))).toEqual([[ElementAst, 'div'], [BoundEventAst, 'event', null, 'v']]);
-        });
+            it('should parse bound events via on- and not report them as attributes', () => {
+              expect(humanizeTplAst(parse('<div on-event="v">', [
+              ]))).toEqual([[ElementAst, 'div'], [BoundEventAst, 'event', null, 'v']]);
+            });
 
-        it('should allow events on explicit embedded templates that are emitted by a directive',
-           () => {
-             var dirA = CompileDirectiveMetadata.create({
-               selector: 'template',
-               outputs: ['e'],
-               type: new CompileTypeMetadata(
-                   {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>})
-             });
-             expect(humanizeTplAst(parse('<template (e)="f"></template>', [dirA]))).toEqual([
-               [EmbeddedTemplateAst],
-               [BoundEventAst, 'e', null, 'f'],
-               [DirectiveAst, dirA],
-             ]);
-           });
-      });
+            it('should allow events on explicit embedded templates that are emitted by a directive',
+               () => {
+                 var dirA = CompileDirectiveMetadata.create({
+                   selector: 'template',
+                   outputs: ['e'],
+                   type: new CompileTypeMetadata(
+                       {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>})
+                 });
+                 expect(humanizeTplAst(parse('<template (e)="f"></template>', [dirA]))).toEqual([
+                   [EmbeddedTemplateAst],
+                   [BoundEventAst, 'e', null, 'f'],
+                   [DirectiveAst, dirA],
+                 ]);
+               });
+          });
 
-      describe('bindon', () => {
-        it('should parse bound events and properties via [(...)] and not report them as attributes',
-           () => {
-             expect(humanizeTplAst(parse('<div [(prop)]="v">', []))).toEqual([
-               [ElementAst, 'div'],
-               [BoundElementPropertyAst, PropertyBindingType.Property, 'prop', 'v', null],
-               [BoundEventAst, 'propChange', null, 'v = $event']
-             ]);
-           });
-
-        it('should parse bound events and properties via bindon- and not report them as attributes',
-           () => {
-             expect(humanizeTplAst(parse('<div bindon-prop="v">', []))).toEqual([
-               [ElementAst, 'div'],
-               [BoundElementPropertyAst, PropertyBindingType.Property, 'prop', 'v', null],
-               [BoundEventAst, 'propChange', null, 'v = $event']
-             ]);
-           });
+          describe('bindon', () => {
+            it('should parse bound events and properties via [(...)] and not report them as attributes',
+               () => {
+                 expect(humanizeTplAst(parse('<div [(prop)]="v">', []))).toEqual([
+                   [ElementAst, 'div'],
+                   [BoundElementPropertyAst, PropertyBindingType.Property, 'prop', 'v', null],
+                   [BoundEventAst, 'propChange', null, 'v = $event']
+                 ]);
+               });
 
-      });
+            it('should parse bound events and properties via bindon- and not report them as attributes',
+               () => {
+                 expect(humanizeTplAst(parse('<div bindon-prop="v">', []))).toEqual([
+                   [ElementAst, 'div'],
+                   [BoundElementPropertyAst, PropertyBindingType.Property, 'prop', 'v', null],
+                   [BoundEventAst, 'propChange', null, 'v = $event']
+                 ]);
+               });
 
-      describe('directives', () => {
-        it('should order directives by the directives array in the View and match them only once',
-           () => {
-             var dirA = CompileDirectiveMetadata.create({
-               selector: '[a]',
-               type: new CompileTypeMetadata(
-                   {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>})
-             });
-             var dirB = CompileDirectiveMetadata.create({
-               selector: '[b]',
-               type: new CompileTypeMetadata(
-                   {moduleUrl: someModuleUrl, name: 'DirB', reference: {} as Type<any>})
-             });
-             var dirC = CompileDirectiveMetadata.create({
-               selector: '[c]',
-               type: new CompileTypeMetadata(
-                   {moduleUrl: someModuleUrl, name: 'DirC', reference: {} as Type<any>})
-             });
-             expect(humanizeTplAst(parse('<div a c b a b>', [dirA, dirB, dirC]))).toEqual([
-               [ElementAst, 'div'], [AttrAst, 'a', ''], [AttrAst, 'c', ''], [AttrAst, 'b', ''],
-               [AttrAst, 'a', ''], [AttrAst, 'b', ''], [DirectiveAst, dirA], [DirectiveAst, dirB],
-               [DirectiveAst, dirC]
-             ]);
-           });
-
-        it('should locate directives in property bindings', () => {
-          var dirA = CompileDirectiveMetadata.create({
-            selector: '[a=b]',
-            type: new CompileTypeMetadata(
-                {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>})
           });
-          var dirB = CompileDirectiveMetadata.create({
-            selector: '[b]',
-            type: new CompileTypeMetadata(
-                {moduleUrl: someModuleUrl, name: 'DirB', reference: {} as Type<any>})
-          });
-          expect(humanizeTplAst(parse('<div [a]="b">', [dirA, dirB]))).toEqual([
-            [ElementAst, 'div'],
-            [BoundElementPropertyAst, PropertyBindingType.Property, 'a', 'b', null],
-            [DirectiveAst, dirA]
-          ]);
-        });
 
-        it('should locate directives in event bindings', () => {
-          var dirA = CompileDirectiveMetadata.create({
-            selector: '[a]',
-            type: new CompileTypeMetadata(
-                {moduleUrl: someModuleUrl, name: 'DirB', reference: {} as Type<any>})
-          });
+          describe('directives', () => {
+            it('should order directives by the directives array in the View and match them only once',
+               () => {
+                 var dirA = CompileDirectiveMetadata.create({
+                   selector: '[a]',
+                   type: new CompileTypeMetadata(
+                       {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>})
+                 });
+                 var dirB = CompileDirectiveMetadata.create({
+                   selector: '[b]',
+                   type: new CompileTypeMetadata(
+                       {moduleUrl: someModuleUrl, name: 'DirB', reference: {} as Type<any>})
+                 });
+                 var dirC = CompileDirectiveMetadata.create({
+                   selector: '[c]',
+                   type: new CompileTypeMetadata(
+                       {moduleUrl: someModuleUrl, name: 'DirC', reference: {} as Type<any>})
+                 });
+                 expect(humanizeTplAst(parse('<div a c b a b>', [dirA, dirB, dirC]))).toEqual([
+                   [ElementAst, 'div'], [AttrAst, 'a', ''], [AttrAst, 'c', ''], [AttrAst, 'b', ''],
+                   [AttrAst, 'a', ''], [AttrAst, 'b', ''], [DirectiveAst, dirA],
+                   [DirectiveAst, dirB], [DirectiveAst, dirC]
+                 ]);
+               });
+
+            it('should locate directives in property bindings', () => {
+              var dirA = CompileDirectiveMetadata.create({
+                selector: '[a=b]',
+                type: new CompileTypeMetadata(
+                    {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>})
+              });
+              var dirB = CompileDirectiveMetadata.create({
+                selector: '[b]',
+                type: new CompileTypeMetadata(
+                    {moduleUrl: someModuleUrl, name: 'DirB', reference: {} as Type<any>})
+              });
+              expect(humanizeTplAst(parse('<div [a]="b">', [dirA, dirB]))).toEqual([
+                [ElementAst, 'div'],
+                [BoundElementPropertyAst, PropertyBindingType.Property, 'a', 'b', null],
+                [DirectiveAst, dirA]
+              ]);
+            });
 
-          expect(humanizeTplAst(parse('<div (a)="b">', [dirA]))).toEqual([
-            [ElementAst, 'div'], [BoundEventAst, 'a', null, 'b'], [DirectiveAst, dirA]
-          ]);
-        });
+            it('should locate directives in event bindings', () => {
+              var dirA = CompileDirectiveMetadata.create({
+                selector: '[a]',
+                type: new CompileTypeMetadata(
+                    {moduleUrl: someModuleUrl, name: 'DirB', reference: {} as Type<any>})
+              });
 
-        it('should parse directive host properties', () => {
-          var dirA = CompileDirectiveMetadata.create({
-            selector: 'div',
-            type: new CompileTypeMetadata(
-                {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>}),
-            host: {'[a]': 'expr'}
-          });
-          expect(humanizeTplAst(parse('<div></div>', [dirA]))).toEqual([
-            [ElementAst, 'div'], [DirectiveAst, dirA],
-            [BoundElementPropertyAst, PropertyBindingType.Property, 'a', 'expr', null]
-          ]);
-        });
+              expect(humanizeTplAst(parse('<div (a)="b">', [dirA]))).toEqual([
+                [ElementAst, 'div'], [BoundEventAst, 'a', null, 'b'], [DirectiveAst, dirA]
+              ]);
+            });
 
-        it('should parse directive host listeners', () => {
-          var dirA = CompileDirectiveMetadata.create({
-            selector: 'div',
-            type: new CompileTypeMetadata(
-                {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>}),
-            host: {'(a)': 'expr'}
-          });
-          expect(humanizeTplAst(parse('<div></div>', [dirA]))).toEqual([
-            [ElementAst, 'div'], [DirectiveAst, dirA], [BoundEventAst, 'a', null, 'expr']
-          ]);
-        });
+            it('should parse directive host properties', () => {
+              var dirA = CompileDirectiveMetadata.create({
+                selector: 'div',
+                type: new CompileTypeMetadata(
+                    {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>}),
+                host: {'[a]': 'expr'}
+              });
+              expect(humanizeTplAst(parse('<div></div>', [dirA]))).toEqual([
+                [ElementAst, 'div'], [DirectiveAst, dirA],
+                [BoundElementPropertyAst, PropertyBindingType.Property, 'a', 'expr', null]
+              ]);
+            });
 
-        it('should parse directive properties', () => {
-          var dirA = CompileDirectiveMetadata.create({
-            selector: 'div',
-            type: new CompileTypeMetadata(
-                {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>}),
-            inputs: ['aProp']
-          });
-          expect(humanizeTplAst(parse('<div [aProp]="expr"></div>', [dirA]))).toEqual([
-            [ElementAst, 'div'], [DirectiveAst, dirA],
-            [BoundDirectivePropertyAst, 'aProp', 'expr']
-          ]);
-        });
+            it('should parse directive host listeners', () => {
+              var dirA = CompileDirectiveMetadata.create({
+                selector: 'div',
+                type: new CompileTypeMetadata(
+                    {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>}),
+                host: {'(a)': 'expr'}
+              });
+              expect(humanizeTplAst(parse('<div></div>', [dirA]))).toEqual([
+                [ElementAst, 'div'], [DirectiveAst, dirA], [BoundEventAst, 'a', null, 'expr']
+              ]);
+            });
 
-        it('should parse renamed directive properties', () => {
-          var dirA = CompileDirectiveMetadata.create({
-            selector: 'div',
-            type: new CompileTypeMetadata(
-                {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>}),
-            inputs: ['b:a']
-          });
-          expect(humanizeTplAst(parse('<div [a]="expr"></div>', [dirA]))).toEqual([
-            [ElementAst, 'div'], [DirectiveAst, dirA], [BoundDirectivePropertyAst, 'b', 'expr']
-          ]);
-        });
+            it('should parse directive properties', () => {
+              var dirA = CompileDirectiveMetadata.create({
+                selector: 'div',
+                type: new CompileTypeMetadata(
+                    {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>}),
+                inputs: ['aProp']
+              });
+              expect(humanizeTplAst(parse('<div [aProp]="expr"></div>', [dirA]))).toEqual([
+                [ElementAst, 'div'], [DirectiveAst, dirA],
+                [BoundDirectivePropertyAst, 'aProp', 'expr']
+              ]);
+            });
 
-        it('should parse literal directive properties', () => {
-          var dirA = CompileDirectiveMetadata.create({
-            selector: 'div',
-            type: new CompileTypeMetadata(
-                {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>}),
-            inputs: ['a']
-          });
-          expect(humanizeTplAst(parse('<div a="literal"></div>', [dirA]))).toEqual([
-            [ElementAst, 'div'], [AttrAst, 'a', 'literal'], [DirectiveAst, dirA],
-            [BoundDirectivePropertyAst, 'a', '"literal"']
-          ]);
-        });
+            it('should parse renamed directive properties', () => {
+              var dirA = CompileDirectiveMetadata.create({
+                selector: 'div',
+                type: new CompileTypeMetadata(
+                    {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>}),
+                inputs: ['b:a']
+              });
+              expect(humanizeTplAst(parse('<div [a]="expr"></div>', [dirA]))).toEqual([
+                [ElementAst, 'div'], [DirectiveAst, dirA],
+                [BoundDirectivePropertyAst, 'b', 'expr']
+              ]);
+            });
 
-        it('should favor explicit bound properties over literal properties', () => {
-          var dirA = CompileDirectiveMetadata.create({
-            selector: 'div',
-            type: new CompileTypeMetadata(
-                {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>}),
-            inputs: ['a']
-          });
-          expect(humanizeTplAst(parse('<div a="literal" [a]="\'literal2\'"></div>', [dirA])))
-              .toEqual([
+            it('should parse literal directive properties', () => {
+              var dirA = CompileDirectiveMetadata.create({
+                selector: 'div',
+                type: new CompileTypeMetadata(
+                    {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>}),
+                inputs: ['a']
+              });
+              expect(humanizeTplAst(parse('<div a="literal"></div>', [dirA]))).toEqual([
                 [ElementAst, 'div'], [AttrAst, 'a', 'literal'], [DirectiveAst, dirA],
-                [BoundDirectivePropertyAst, 'a', '"literal2"']
+                [BoundDirectivePropertyAst, 'a', '"literal"']
               ]);
-        });
+            });
+
+            it('should favor explicit bound properties over literal properties', () => {
+              var dirA = CompileDirectiveMetadata.create({
+                selector: 'div',
+                type: new CompileTypeMetadata(
+                    {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>}),
+                inputs: ['a']
+              });
+              expect(humanizeTplAst(parse('<div a="literal" [a]="\'literal2\'"></div>', [dirA])))
+                  .toEqual([
+                    [ElementAst, 'div'], [AttrAst, 'a', 'literal'], [DirectiveAst, dirA],
+                    [BoundDirectivePropertyAst, 'a', '"literal2"']
+                  ]);
+            });
+
+            it('should support optional directive properties', () => {
+              var dirA = CompileDirectiveMetadata.create({
+                selector: 'div',
+                type: new CompileTypeMetadata(
+                    {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>}),
+                inputs: ['a']
+              });
+              expect(humanizeTplAst(parse('<div></div>', [dirA]))).toEqual([
+                [ElementAst, 'div'], [DirectiveAst, dirA]
+              ]);
+            });
 
-        it('should support optional directive properties', () => {
-          var dirA = CompileDirectiveMetadata.create({
-            selector: 'div',
-            type: new CompileTypeMetadata(
-                {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>}),
-            inputs: ['a']
           });
-          expect(humanizeTplAst(parse('<div></div>', [dirA]))).toEqual([
-            [ElementAst, 'div'], [DirectiveAst, dirA]
-          ]);
-        });
 
-      });
+          describe('providers', () => {
+            var nextProviderId: number;
+
+            function createToken(value: string): CompileTokenMetadata {
+              let token: CompileTokenMetadata;
+              if (value.startsWith('type:')) {
+                const name = value.substring(5);
+                token = new CompileTokenMetadata({
+                  identifier: new CompileTypeMetadata(
+                      {moduleUrl: someModuleUrl, name, reference: name as any as Type<any>})
+                });
+              } else {
+                token = new CompileTokenMetadata({value: value});
+              }
+              return token;
+            }
 
-      describe('providers', () => {
-        var nextProviderId: number;
+            function createDep(value: string): CompileDiDependencyMetadata {
+              var isOptional = false;
+              if (value.startsWith('optional:')) {
+                isOptional = true;
+                value = value.substring(9);
+              }
+              var isSelf = false;
+              if (value.startsWith('self:')) {
+                isSelf = true;
+                value = value.substring(5);
+              }
+              var isHost = false;
+              if (value.startsWith('host:')) {
+                isHost = true;
+                value = value.substring(5);
+              }
+              return new CompileDiDependencyMetadata({
+                token: createToken(value),
+                isOptional: isOptional,
+                isSelf: isSelf,
+                isHost: isHost
+              });
+            }
 
-        function createToken(value: string): CompileTokenMetadata {
-          let token: CompileTokenMetadata;
-          if (value.startsWith('type:')) {
-            const name = value.substring(5);
-            token = new CompileTokenMetadata({
-              identifier: new CompileTypeMetadata(
-                  {moduleUrl: someModuleUrl, name, reference: name as any as Type<any>})
-            });
-          } else {
-            token = new CompileTokenMetadata({value: value});
-          }
-          return token;
-        }
-
-        function createDep(value: string): CompileDiDependencyMetadata {
-          var isOptional = false;
-          if (value.startsWith('optional:')) {
-            isOptional = true;
-            value = value.substring(9);
-          }
-          var isSelf = false;
-          if (value.startsWith('self:')) {
-            isSelf = true;
-            value = value.substring(5);
-          }
-          var isHost = false;
-          if (value.startsWith('host:')) {
-            isHost = true;
-            value = value.substring(5);
-          }
-          return new CompileDiDependencyMetadata(
-              {token: createToken(value), isOptional: isOptional, isSelf: isSelf, isHost: isHost});
-        }
-
-        function createProvider(
-            token: string, {multi = false, deps = []}: {multi?: boolean, deps?: string[]} = {}):
-            CompileProviderMetadata {
-          const name = `provider${nextProviderId++}`;
-          return new CompileProviderMetadata({
-            token: createToken(token),
-            multi: multi,
-            useClass: new CompileTypeMetadata({name, reference: name as any as Type<any>}),
-            deps: deps.map(createDep)
-          });
-        }
-
-        function createDir(
-            selector: string, {providers = null, viewProviders = null, deps = [], queries = []}: {
-              providers?: CompileProviderMetadata[],
-              viewProviders?: CompileProviderMetadata[],
-              deps?: string[],
-              queries?: string[]
-            } = {}): CompileDirectiveMetadata {
-          var isComponent = !selector.startsWith('[');
-          return CompileDirectiveMetadata.create({
-            selector: selector,
-            type: new CompileTypeMetadata({
-              moduleUrl: someModuleUrl,
-              name: selector,
-              diDeps: deps.map(createDep),
-              reference: selector as any as Type<any>
-            }),
-            isComponent: isComponent,
-            template: new CompileTemplateMetadata({ngContentSelectors: []}),
-            providers: providers,
-            viewProviders: viewProviders,
-            queries: queries.map(
-                (value) => new CompileQueryMetadata({selectors: [createToken(value)]}))
-          });
-        }
+            function createProvider(
+                token: string, {multi = false, deps = []}: {multi?: boolean, deps?: string[]} = {}):
+                CompileProviderMetadata {
+              const name = `provider${nextProviderId++}`;
+              return new CompileProviderMetadata({
+                token: createToken(token),
+                multi: multi,
+                useClass: new CompileTypeMetadata({name, reference: name as any as Type<any>}),
+                deps: deps.map(createDep)
+              });
+            }
 
-        beforeEach(() => { nextProviderId = 0; });
+            function createDir(
+                selector: string,
+                {providers = null, viewProviders = null, deps = [], queries = []}: {
+                  providers?: CompileProviderMetadata[],
+                  viewProviders?: CompileProviderMetadata[],
+                  deps?: string[],
+                  queries?: string[]
+                } = {}): CompileDirectiveMetadata {
+              var isComponent = !selector.startsWith('[');
+              return CompileDirectiveMetadata.create({
+                selector: selector,
+                type: new CompileTypeMetadata({
+                  moduleUrl: someModuleUrl,
+                  name: selector,
+                  diDeps: deps.map(createDep),
+                  reference: selector as any as Type<any>
+                }),
+                isComponent: isComponent,
+                template: new CompileTemplateMetadata({ngContentSelectors: []}),
+                providers: providers,
+                viewProviders: viewProviders,
+                queries: queries.map(
+                    (value) => new CompileQueryMetadata({selectors: [createToken(value)]}))
+              });
+            }
 
-        it('should provide a component', () => {
-          var comp = createDir('my-comp');
-          var elAst: ElementAst = <ElementAst>parse('<my-comp>', [comp])[0];
-          expect(elAst.providers.length).toBe(1);
-          expect(elAst.providers[0].providerType).toBe(ProviderAstType.Component);
-          expect(elAst.providers[0].providers[0].useClass).toBe(comp.type);
-        });
+            beforeEach(() => { nextProviderId = 0; });
 
-        it('should provide a directive', () => {
-          var dirA = createDir('[dirA]');
-          var elAst: ElementAst = <ElementAst>parse('<div dirA>', [dirA])[0];
-          expect(elAst.providers.length).toBe(1);
-          expect(elAst.providers[0].providerType).toBe(ProviderAstType.Directive);
-          expect(elAst.providers[0].providers[0].useClass).toBe(dirA.type);
-        });
+            it('should provide a component', () => {
+              var comp = createDir('my-comp');
+              var elAst: ElementAst = <ElementAst>parse('<my-comp>', [comp])[0];
+              expect(elAst.providers.length).toBe(1);
+              expect(elAst.providers[0].providerType).toBe(ProviderAstType.Component);
+              expect(elAst.providers[0].providers[0].useClass).toBe(comp.type);
+            });
 
-        it('should use the public providers of a directive', () => {
-          var provider = createProvider('service');
-          var dirA = createDir('[dirA]', {providers: [provider]});
-          var elAst: ElementAst = <ElementAst>parse('<div dirA>', [dirA])[0];
-          expect(elAst.providers.length).toBe(2);
-          expect(elAst.providers[1].providerType).toBe(ProviderAstType.PublicService);
-          expect(elAst.providers[1].providers).toEqual([provider]);
-        });
+            it('should provide a directive', () => {
+              var dirA = createDir('[dirA]');
+              var elAst: ElementAst = <ElementAst>parse('<div dirA>', [dirA])[0];
+              expect(elAst.providers.length).toBe(1);
+              expect(elAst.providers[0].providerType).toBe(ProviderAstType.Directive);
+              expect(elAst.providers[0].providers[0].useClass).toBe(dirA.type);
+            });
 
-        it('should use the private providers of a component', () => {
-          var provider = createProvider('service');
-          var comp = createDir('my-comp', {viewProviders: [provider]});
-          var elAst: ElementAst = <ElementAst>parse('<my-comp>', [comp])[0];
-          expect(elAst.providers.length).toBe(2);
-          expect(elAst.providers[1].providerType).toBe(ProviderAstType.PrivateService);
-          expect(elAst.providers[1].providers).toEqual([provider]);
-        });
+            it('should use the public providers of a directive', () => {
+              var provider = createProvider('service');
+              var dirA = createDir('[dirA]', {providers: [provider]});
+              var elAst: ElementAst = <ElementAst>parse('<div dirA>', [dirA])[0];
+              expect(elAst.providers.length).toBe(2);
+              expect(elAst.providers[1].providerType).toBe(ProviderAstType.PublicService);
+              expect(elAst.providers[1].providers).toEqual([provider]);
+            });
 
-        it('should support multi providers', () => {
-          var provider0 = createProvider('service0', {multi: true});
-          var provider1 = createProvider('service1', {multi: true});
-          var provider2 = createProvider('service0', {multi: true});
-          var dirA = createDir('[dirA]', {providers: [provider0, provider1]});
-          var dirB = createDir('[dirB]', {providers: [provider2]});
-          var elAst: ElementAst = <ElementAst>parse('<div dirA dirB>', [dirA, dirB])[0];
-          expect(elAst.providers.length).toBe(4);
-          expect(elAst.providers[2].providers).toEqual([provider0, provider2]);
-          expect(elAst.providers[3].providers).toEqual([provider1]);
-        });
+            it('should use the private providers of a component', () => {
+              var provider = createProvider('service');
+              var comp = createDir('my-comp', {viewProviders: [provider]});
+              var elAst: ElementAst = <ElementAst>parse('<my-comp>', [comp])[0];
+              expect(elAst.providers.length).toBe(2);
+              expect(elAst.providers[1].providerType).toBe(ProviderAstType.PrivateService);
+              expect(elAst.providers[1].providers).toEqual([provider]);
+            });
 
-        it('should overwrite non multi providers', () => {
-          var provider1 = createProvider('service0');
-          var provider2 = createProvider('service1');
-          var provider3 = createProvider('service0');
-          var dirA = createDir('[dirA]', {providers: [provider1, provider2]});
-          var dirB = createDir('[dirB]', {providers: [provider3]});
-          var elAst: ElementAst = <ElementAst>parse('<div dirA dirB>', [dirA, dirB])[0];
-          expect(elAst.providers.length).toBe(4);
-          expect(elAst.providers[2].providers).toEqual([provider3]);
-          expect(elAst.providers[3].providers).toEqual([provider2]);
-        });
+            it('should support multi providers', () => {
+              var provider0 = createProvider('service0', {multi: true});
+              var provider1 = createProvider('service1', {multi: true});
+              var provider2 = createProvider('service0', {multi: true});
+              var dirA = createDir('[dirA]', {providers: [provider0, provider1]});
+              var dirB = createDir('[dirB]', {providers: [provider2]});
+              var elAst: ElementAst = <ElementAst>parse('<div dirA dirB>', [dirA, dirB])[0];
+              expect(elAst.providers.length).toBe(4);
+              expect(elAst.providers[2].providers).toEqual([provider0, provider2]);
+              expect(elAst.providers[3].providers).toEqual([provider1]);
+            });
 
-        it('should overwrite component providers by directive providers', () => {
-          var compProvider = createProvider('service0');
-          var dirProvider = createProvider('service0');
-          var comp = createDir('my-comp', {providers: [compProvider]});
-          var dirA = createDir('[dirA]', {providers: [dirProvider]});
-          var elAst: ElementAst = <ElementAst>parse('<my-comp dirA>', [dirA, comp])[0];
-          expect(elAst.providers.length).toBe(3);
-          expect(elAst.providers[2].providers).toEqual([dirProvider]);
-        });
+            it('should overwrite non multi providers', () => {
+              var provider1 = createProvider('service0');
+              var provider2 = createProvider('service1');
+              var provider3 = createProvider('service0');
+              var dirA = createDir('[dirA]', {providers: [provider1, provider2]});
+              var dirB = createDir('[dirB]', {providers: [provider3]});
+              var elAst: ElementAst = <ElementAst>parse('<div dirA dirB>', [dirA, dirB])[0];
+              expect(elAst.providers.length).toBe(4);
+              expect(elAst.providers[2].providers).toEqual([provider3]);
+              expect(elAst.providers[3].providers).toEqual([provider2]);
+            });
 
-        it('should overwrite view providers by directive providers', () => {
-          var viewProvider = createProvider('service0');
-          var dirProvider = createProvider('service0');
-          var comp = createDir('my-comp', {viewProviders: [viewProvider]});
-          var dirA = createDir('[dirA]', {providers: [dirProvider]});
-          var elAst: ElementAst = <ElementAst>parse('<my-comp dirA>', [dirA, comp])[0];
-          expect(elAst.providers.length).toBe(3);
-          expect(elAst.providers[2].providers).toEqual([dirProvider]);
-        });
+            it('should overwrite component providers by directive providers', () => {
+              var compProvider = createProvider('service0');
+              var dirProvider = createProvider('service0');
+              var comp = createDir('my-comp', {providers: [compProvider]});
+              var dirA = createDir('[dirA]', {providers: [dirProvider]});
+              var elAst: ElementAst = <ElementAst>parse('<my-comp dirA>', [dirA, comp])[0];
+              expect(elAst.providers.length).toBe(3);
+              expect(elAst.providers[2].providers).toEqual([dirProvider]);
+            });
 
-        it('should overwrite directives by providers', () => {
-          var dirProvider = createProvider('type:my-comp');
-          var comp = createDir('my-comp', {providers: [dirProvider]});
-          var elAst: ElementAst = <ElementAst>parse('<my-comp>', [comp])[0];
-          expect(elAst.providers.length).toBe(1);
-          expect(elAst.providers[0].providers).toEqual([dirProvider]);
-        });
+            it('should overwrite view providers by directive providers', () => {
+              var viewProvider = createProvider('service0');
+              var dirProvider = createProvider('service0');
+              var comp = createDir('my-comp', {viewProviders: [viewProvider]});
+              var dirA = createDir('[dirA]', {providers: [dirProvider]});
+              var elAst: ElementAst = <ElementAst>parse('<my-comp dirA>', [dirA, comp])[0];
+              expect(elAst.providers.length).toBe(3);
+              expect(elAst.providers[2].providers).toEqual([dirProvider]);
+            });
 
-        it('if mixing multi and non multi providers', () => {
-          var provider0 = createProvider('service0');
-          var provider1 = createProvider('service0', {multi: true});
-          var dirA = createDir('[dirA]', {providers: [provider0]});
-          var dirB = createDir('[dirB]', {providers: [provider1]});
-          expect(() => parse('<div dirA dirB>', [dirA, dirB]))
-              .toThrowError(
-                  `Template parse errors:\n` +
-                  `Mixing multi and non multi provider is not possible for token service0 ("[ERROR ->]<div dirA dirB>"): TestComp@0:0`);
-        });
+            it('should overwrite directives by providers', () => {
+              var dirProvider = createProvider('type:my-comp');
+              var comp = createDir('my-comp', {providers: [dirProvider]});
+              var elAst: ElementAst = <ElementAst>parse('<my-comp>', [comp])[0];
+              expect(elAst.providers.length).toBe(1);
+              expect(elAst.providers[0].providers).toEqual([dirProvider]);
+            });
 
-        it('should sort providers by their DI order', () => {
-          var provider0 = createProvider('service0', {deps: ['type:[dir2]']});
-          var provider1 = createProvider('service1');
-          var dir2 = createDir('[dir2]', {deps: ['service1']});
-          var comp = createDir('my-comp', {providers: [provider0, provider1]});
-          var elAst: ElementAst = <ElementAst>parse('<my-comp dir2>', [comp, dir2])[0];
-          expect(elAst.providers.length).toBe(4);
-          expect(elAst.providers[0].providers[0].useClass).toEqual(comp.type);
-          expect(elAst.providers[1].providers).toEqual([provider1]);
-          expect(elAst.providers[2].providers[0].useClass).toEqual(dir2.type);
-          expect(elAst.providers[3].providers).toEqual([provider0]);
-        });
+            it('if mixing multi and non multi providers', () => {
+              var provider0 = createProvider('service0');
+              var provider1 = createProvider('service0', {multi: true});
+              var dirA = createDir('[dirA]', {providers: [provider0]});
+              var dirB = createDir('[dirB]', {providers: [provider1]});
+              expect(() => parse('<div dirA dirB>', [dirA, dirB]))
+                  .toThrowError(
+                      `Template parse errors:\n` +
+                      `Mixing multi and non multi provider is not possible for token service0 ("[ERROR ->]<div dirA dirB>"): TestComp@0:0`);
+            });
 
-        it('should sort directives by their DI order', () => {
-          var dir0 = createDir('[dir0]', {deps: ['type:my-comp']});
-          var dir1 = createDir('[dir1]', {deps: ['type:[dir0]']});
-          var dir2 = createDir('[dir2]', {deps: ['type:[dir1]']});
-          var comp = createDir('my-comp');
-          var elAst: ElementAst =
-              <ElementAst>parse('<my-comp dir2 dir0 dir1>', [comp, dir2, dir0, dir1])[0];
-          expect(elAst.providers.length).toBe(4);
-          expect(elAst.directives[0].directive).toBe(comp);
-          expect(elAst.directives[1].directive).toBe(dir0);
-          expect(elAst.directives[2].directive).toBe(dir1);
-          expect(elAst.directives[3].directive).toBe(dir2);
-        });
+            it('should sort providers by their DI order', () => {
+              var provider0 = createProvider('service0', {deps: ['type:[dir2]']});
+              var provider1 = createProvider('service1');
+              var dir2 = createDir('[dir2]', {deps: ['service1']});
+              var comp = createDir('my-comp', {providers: [provider0, provider1]});
+              var elAst: ElementAst = <ElementAst>parse('<my-comp dir2>', [comp, dir2])[0];
+              expect(elAst.providers.length).toBe(4);
+              expect(elAst.providers[0].providers[0].useClass).toEqual(comp.type);
+              expect(elAst.providers[1].providers).toEqual([provider1]);
+              expect(elAst.providers[2].providers[0].useClass).toEqual(dir2.type);
+              expect(elAst.providers[3].providers).toEqual([provider0]);
+            });
 
-        it('should mark directives and dependencies of directives as eager', () => {
-          var provider0 = createProvider('service0');
-          var provider1 = createProvider('service1');
-          var dirA = createDir('[dirA]', {providers: [provider0, provider1], deps: ['service0']});
-          var elAst: ElementAst = <ElementAst>parse('<div dirA>', [dirA])[0];
-          expect(elAst.providers.length).toBe(3);
-          expect(elAst.providers[0].providers).toEqual([provider0]);
-          expect(elAst.providers[0].eager).toBe(true);
-          expect(elAst.providers[1].providers[0].useClass).toEqual(dirA.type);
-          expect(elAst.providers[1].eager).toBe(true);
-          expect(elAst.providers[2].providers).toEqual([provider1]);
-          expect(elAst.providers[2].eager).toBe(false);
-        });
+            it('should sort directives by their DI order', () => {
+              var dir0 = createDir('[dir0]', {deps: ['type:my-comp']});
+              var dir1 = createDir('[dir1]', {deps: ['type:[dir0]']});
+              var dir2 = createDir('[dir2]', {deps: ['type:[dir1]']});
+              var comp = createDir('my-comp');
+              var elAst: ElementAst =
+                  <ElementAst>parse('<my-comp dir2 dir0 dir1>', [comp, dir2, dir0, dir1])[0];
+              expect(elAst.providers.length).toBe(4);
+              expect(elAst.directives[0].directive).toBe(comp);
+              expect(elAst.directives[1].directive).toBe(dir0);
+              expect(elAst.directives[2].directive).toBe(dir1);
+              expect(elAst.directives[3].directive).toBe(dir2);
+            });
 
-        it('should mark dependencies on parent elements as eager', () => {
-          var provider0 = createProvider('service0');
-          var provider1 = createProvider('service1');
-          var dirA = createDir('[dirA]', {providers: [provider0, provider1]});
-          var dirB = createDir('[dirB]', {deps: ['service0']});
-          var elAst: ElementAst =
-              <ElementAst>parse('<div dirA><div dirB></div></div>', [dirA, dirB])[0];
-          expect(elAst.providers.length).toBe(3);
-          expect(elAst.providers[0].providers[0].useClass).toEqual(dirA.type);
-          expect(elAst.providers[0].eager).toBe(true);
-          expect(elAst.providers[1].providers).toEqual([provider0]);
-          expect(elAst.providers[1].eager).toBe(true);
-          expect(elAst.providers[2].providers).toEqual([provider1]);
-          expect(elAst.providers[2].eager).toBe(false);
-        });
+            it('should mark directives and dependencies of directives as eager', () => {
+              var provider0 = createProvider('service0');
+              var provider1 = createProvider('service1');
+              var dirA =
+                  createDir('[dirA]', {providers: [provider0, provider1], deps: ['service0']});
+              var elAst: ElementAst = <ElementAst>parse('<div dirA>', [dirA])[0];
+              expect(elAst.providers.length).toBe(3);
+              expect(elAst.providers[0].providers).toEqual([provider0]);
+              expect(elAst.providers[0].eager).toBe(true);
+              expect(elAst.providers[1].providers[0].useClass).toEqual(dirA.type);
+              expect(elAst.providers[1].eager).toBe(true);
+              expect(elAst.providers[2].providers).toEqual([provider1]);
+              expect(elAst.providers[2].eager).toBe(false);
+            });
 
-        it('should mark queried providers as eager', () => {
-          var provider0 = createProvider('service0');
-          var provider1 = createProvider('service1');
-          var dirA =
-              createDir('[dirA]', {providers: [provider0, provider1], queries: ['service0']});
-          var elAst: ElementAst = <ElementAst>parse('<div dirA></div>', [dirA])[0];
-          expect(elAst.providers.length).toBe(3);
-          expect(elAst.providers[0].providers[0].useClass).toEqual(dirA.type);
-          expect(elAst.providers[0].eager).toBe(true);
-          expect(elAst.providers[1].providers).toEqual([provider0]);
-          expect(elAst.providers[1].eager).toBe(true);
-          expect(elAst.providers[2].providers).toEqual([provider1]);
-          expect(elAst.providers[2].eager).toBe(false);
-        });
+            it('should mark dependencies on parent elements as eager', () => {
+              var provider0 = createProvider('service0');
+              var provider1 = createProvider('service1');
+              var dirA = createDir('[dirA]', {providers: [provider0, provider1]});
+              var dirB = createDir('[dirB]', {deps: ['service0']});
+              var elAst: ElementAst =
+                  <ElementAst>parse('<div dirA><div dirB></div></div>', [dirA, dirB])[0];
+              expect(elAst.providers.length).toBe(3);
+              expect(elAst.providers[0].providers[0].useClass).toEqual(dirA.type);
+              expect(elAst.providers[0].eager).toBe(true);
+              expect(elAst.providers[1].providers).toEqual([provider0]);
+              expect(elAst.providers[1].eager).toBe(true);
+              expect(elAst.providers[2].providers).toEqual([provider1]);
+              expect(elAst.providers[2].eager).toBe(false);
+            });
 
-        it('should not mark dependencies accross embedded views as eager', () => {
-          var provider0 = createProvider('service0');
-          var dirA = createDir('[dirA]', {providers: [provider0]});
-          var dirB = createDir('[dirB]', {deps: ['service0']});
-          var elAst: ElementAst =
-              <ElementAst>parse('<div dirA><div *ngIf dirB></div></div>', [dirA, dirB])[0];
-          expect(elAst.providers.length).toBe(2);
-          expect(elAst.providers[0].providers[0].useClass).toEqual(dirA.type);
-          expect(elAst.providers[0].eager).toBe(true);
-          expect(elAst.providers[1].providers).toEqual([provider0]);
-          expect(elAst.providers[1].eager).toBe(false);
-        });
+            it('should mark queried providers as eager', () => {
+              var provider0 = createProvider('service0');
+              var provider1 = createProvider('service1');
+              var dirA =
+                  createDir('[dirA]', {providers: [provider0, provider1], queries: ['service0']});
+              var elAst: ElementAst = <ElementAst>parse('<div dirA></div>', [dirA])[0];
+              expect(elAst.providers.length).toBe(3);
+              expect(elAst.providers[0].providers[0].useClass).toEqual(dirA.type);
+              expect(elAst.providers[0].eager).toBe(true);
+              expect(elAst.providers[1].providers).toEqual([provider0]);
+              expect(elAst.providers[1].eager).toBe(true);
+              expect(elAst.providers[2].providers).toEqual([provider1]);
+              expect(elAst.providers[2].eager).toBe(false);
+            });
 
-        it('should report missing @Self() deps as errors', () => {
-          var dirA = createDir('[dirA]', {deps: ['self:provider0']});
-          expect(() => parse('<div dirA></div>', [dirA]))
-              .toThrowError(
-                  'Template parse errors:\nNo provider for provider0 ("[ERROR ->]<div dirA></div>"): TestComp@0:0');
-        });
+            it('should not mark dependencies accross embedded views as eager', () => {
+              var provider0 = createProvider('service0');
+              var dirA = createDir('[dirA]', {providers: [provider0]});
+              var dirB = createDir('[dirB]', {deps: ['service0']});
+              var elAst: ElementAst =
+                  <ElementAst>parse('<div dirA><div *ngIf dirB></div></div>', [dirA, dirB])[0];
+              expect(elAst.providers.length).toBe(2);
+              expect(elAst.providers[0].providers[0].useClass).toEqual(dirA.type);
+              expect(elAst.providers[0].eager).toBe(true);
+              expect(elAst.providers[1].providers).toEqual([provider0]);
+              expect(elAst.providers[1].eager).toBe(false);
+            });
 
-        it('should change missing @Self() that are optional to nulls', () => {
-          var dirA = createDir('[dirA]', {deps: ['optional:self:provider0']});
-          var elAst: ElementAst = <ElementAst>parse('<div dirA></div>', [dirA])[0];
-          expect(elAst.providers[0].providers[0].deps[0].isValue).toBe(true);
-          expect(elAst.providers[0].providers[0].deps[0].value).toBe(null);
-        });
+            it('should report missing @Self() deps as errors', () => {
+              var dirA = createDir('[dirA]', {deps: ['self:provider0']});
+              expect(() => parse('<div dirA></div>', [dirA]))
+                  .toThrowError(
+                      'Template parse errors:\nNo provider for provider0 ("[ERROR ->]<div dirA></div>"): TestComp@0:0');
+            });
 
-        it('should report missing @Host() deps as errors', () => {
-          var dirA = createDir('[dirA]', {deps: ['host:provider0']});
-          expect(() => parse('<div dirA></div>', [dirA]))
-              .toThrowError(
-                  'Template parse errors:\nNo provider for provider0 ("[ERROR ->]<div dirA></div>"): TestComp@0:0');
-        });
+            it('should change missing @Self() that are optional to nulls', () => {
+              var dirA = createDir('[dirA]', {deps: ['optional:self:provider0']});
+              var elAst: ElementAst = <ElementAst>parse('<div dirA></div>', [dirA])[0];
+              expect(elAst.providers[0].providers[0].deps[0].isValue).toBe(true);
+              expect(elAst.providers[0].providers[0].deps[0].value).toBe(null);
+            });
 
-        it('should change missing @Host() that are optional to nulls', () => {
-          var dirA = createDir('[dirA]', {deps: ['optional:host:provider0']});
-          var elAst: ElementAst = <ElementAst>parse('<div dirA></div>', [dirA])[0];
-          expect(elAst.providers[0].providers[0].deps[0].isValue).toBe(true);
-          expect(elAst.providers[0].providers[0].deps[0].value).toBe(null);
-        });
-      });
+            it('should report missing @Host() deps as errors', () => {
+              var dirA = createDir('[dirA]', {deps: ['host:provider0']});
+              expect(() => parse('<div dirA></div>', [dirA]))
+                  .toThrowError(
+                      'Template parse errors:\nNo provider for provider0 ("[ERROR ->]<div dirA></div>"): TestComp@0:0');
+            });
 
-      describe('references', () => {
+            it('should change missing @Host() that are optional to nulls', () => {
+              var dirA = createDir('[dirA]', {deps: ['optional:host:provider0']});
+              var elAst: ElementAst = <ElementAst>parse('<div dirA></div>', [dirA])[0];
+              expect(elAst.providers[0].providers[0].deps[0].isValue).toBe(true);
+              expect(elAst.providers[0].providers[0].deps[0].value).toBe(null);
+            });
+          });
 
-        it('should parse references via #... and not report them as attributes', () => {
-          expect(humanizeTplAst(parse('<div #a>', [
-          ]))).toEqual([[ElementAst, 'div'], [ReferenceAst, 'a', null]]);
-        });
+          describe('references', () => {
 
-        it('should parse references via ref-... and not report them as attributes', () => {
-          expect(humanizeTplAst(parse('<div ref-a>', [
-          ]))).toEqual([[ElementAst, 'div'], [ReferenceAst, 'a', null]]);
-        });
+            it('should parse references via #... and not report them as attributes', () => {
+              expect(humanizeTplAst(parse('<div #a>', [
+              ]))).toEqual([[ElementAst, 'div'], [ReferenceAst, 'a', null]]);
+            });
 
-        it('should parse camel case references', () => {
-          expect(humanizeTplAst(parse('<div ref-someA>', [
-          ]))).toEqual([[ElementAst, 'div'], [ReferenceAst, 'someA', null]]);
-        });
+            it('should parse references via ref-... and not report them as attributes', () => {
+              expect(humanizeTplAst(parse('<div ref-a>', [
+              ]))).toEqual([[ElementAst, 'div'], [ReferenceAst, 'a', null]]);
+            });
 
-        it('should assign references with empty value to the element', () => {
-          expect(humanizeTplAst(parse('<div #a></div>', [
-          ]))).toEqual([[ElementAst, 'div'], [ReferenceAst, 'a', null]]);
-        });
+            it('should parse camel case references', () => {
+              expect(humanizeTplAst(parse('<div ref-someA>', [
+              ]))).toEqual([[ElementAst, 'div'], [ReferenceAst, 'someA', null]]);
+            });
 
-        it('should assign references to directives via exportAs', () => {
-          var dirA = CompileDirectiveMetadata.create({
-            selector: '[a]',
-            type: new CompileTypeMetadata(
-                {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>}),
-            exportAs: 'dirA'
-          });
-          expect(humanizeTplAst(parse('<div a #a="dirA"></div>', [dirA]))).toEqual([
-            [ElementAst, 'div'],
-            [AttrAst, 'a', ''],
-            [ReferenceAst, 'a', identifierToken(dirA.type)],
-            [DirectiveAst, dirA],
-          ]);
-        });
+            it('should assign references with empty value to the element', () => {
+              expect(humanizeTplAst(parse('<div #a></div>', [
+              ]))).toEqual([[ElementAst, 'div'], [ReferenceAst, 'a', null]]);
+            });
 
-        it('should report references with values that dont match a directive as errors', () => {
-          expect(() => parse('<div #a="dirA"></div>', [])).toThrowError(`Template parse errors:
+            it('should assign references to directives via exportAs', () => {
+              var dirA = CompileDirectiveMetadata.create({
+                selector: '[a]',
+                type: new CompileTypeMetadata(
+                    {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>}),
+                exportAs: 'dirA'
+              });
+              expect(humanizeTplAst(parse('<div a #a="dirA"></div>', [dirA]))).toEqual([
+                [ElementAst, 'div'],
+                [AttrAst, 'a', ''],
+                [ReferenceAst, 'a', identifierToken(dirA.type)],
+                [DirectiveAst, dirA],
+              ]);
+            });
+
+            it('should report references with values that dont match a directive as errors', () => {
+              expect(() => parse('<div #a="dirA"></div>', [])).toThrowError(`Template parse errors:
 There is no directive with "exportAs" set to "dirA" ("<div [ERROR ->]#a="dirA"></div>"): TestComp@0:5`);
-        });
+            });
 
-        it('should report invalid reference names', () => {
-          expect(() => parse('<div #a-b></div>', [])).toThrowError(`Template parse errors:
+            it('should report invalid reference names', () => {
+              expect(() => parse('<div #a-b></div>', [])).toThrowError(`Template parse errors:
 "-" is not allowed in reference names ("<div [ERROR ->]#a-b></div>"): TestComp@0:5`);
-        });
+            });
 
-        it('should report variables as errors', () => {
-          expect(() => parse('<div let-a></div>', [])).toThrowError(`Template parse errors:
+            it('should report variables as errors', () => {
+              expect(() => parse('<div let-a></div>', [])).toThrowError(`Template parse errors:
 "let-" is only supported on template elements. ("<div [ERROR ->]let-a></div>"): TestComp@0:5`);
-        });
+            });
 
-        it('should report duplicate reference names', () => {
-          expect(() => parse('<div #a></div><div #a></div>', []))
-              .toThrowError(`Template parse errors:
+            it('should report duplicate reference names', () => {
+              expect(() => parse('<div #a></div><div #a></div>', []))
+                  .toThrowError(`Template parse errors:
 Reference "#a" is defined several times ("<div #a></div><div [ERROR ->]#a></div>"): TestComp@0:19`);
 
-        });
+            });
 
-        it('should not throw error when there is same reference name in different templates',
-           () => {
-             expect(() => parse('<div #a><template #a><span>OK</span></template></div>', []))
-                 .not.toThrowError();
-
-           });
-
-        it('should assign references with empty value to components', () => {
-          var dirA = CompileDirectiveMetadata.create({
-            selector: '[a]',
-            isComponent: true,
-            type: new CompileTypeMetadata(
-                {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>}),
-            exportAs: 'dirA',
-            template: new CompileTemplateMetadata({ngContentSelectors: []})
-          });
-          expect(humanizeTplAst(parse('<div a #a></div>', [dirA]))).toEqual([
-            [ElementAst, 'div'],
-            [AttrAst, 'a', ''],
-            [ReferenceAst, 'a', identifierToken(dirA.type)],
-            [DirectiveAst, dirA],
-          ]);
-        });
+            it('should not throw error when there is same reference name in different templates',
+               () => {
+                 expect(() => parse('<div #a><template #a><span>OK</span></template></div>', []))
+                     .not.toThrowError();
+
+               });
+
+            it('should assign references with empty value to components', () => {
+              var dirA = CompileDirectiveMetadata.create({
+                selector: '[a]',
+                isComponent: true,
+                type: new CompileTypeMetadata(
+                    {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>}),
+                exportAs: 'dirA',
+                template: new CompileTemplateMetadata({ngContentSelectors: []})
+              });
+              expect(humanizeTplAst(parse('<div a #a></div>', [dirA]))).toEqual([
+                [ElementAst, 'div'],
+                [AttrAst, 'a', ''],
+                [ReferenceAst, 'a', identifierToken(dirA.type)],
+                [DirectiveAst, dirA],
+              ]);
+            });
 
-        it('should not locate directives in references', () => {
-          var dirA = CompileDirectiveMetadata.create({
-            selector: '[a]',
-            type: new CompileTypeMetadata(
-                {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>})
+            it('should not locate directives in references', () => {
+              var dirA = CompileDirectiveMetadata.create({
+                selector: '[a]',
+                type: new CompileTypeMetadata(
+                    {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>})
+              });
+              expect(humanizeTplAst(parse('<div ref-a>', [dirA]))).toEqual([
+                [ElementAst, 'div'], [ReferenceAst, 'a', null]
+              ]);
+            });
           });
-          expect(humanizeTplAst(parse('<div ref-a>', [dirA]))).toEqual([
-            [ElementAst, 'div'], [ReferenceAst, 'a', null]
-          ]);
-        });
-      });
-
-      describe('explicit templates', () => {
-        it('should create embedded templates for <template> elements', () => {
-          expect(humanizeTplAst(parse('<template></template>', [
-          ]))).toEqual([[EmbeddedTemplateAst]]);
-          expect(humanizeTplAst(parse('<TEMPLATE></TEMPLATE>', [
-          ]))).toEqual([[EmbeddedTemplateAst]]);
-        });
 
-        it('should create embedded templates for <template> elements regardless the namespace',
-           () => {
-             expect(humanizeTplAst(parse('<svg><template></template></svg>', []))).toEqual([
-               [ElementAst, ':svg:svg'],
-               [EmbeddedTemplateAst],
-             ]);
-           });
-
-        it('should support references via #...', () => {
-          expect(humanizeTplAst(parse('<template #a>', []))).toEqual([
-            [EmbeddedTemplateAst],
-            [ReferenceAst, 'a', resolveIdentifierToken(Identifiers.TemplateRef)]
-          ]);
-        });
+          describe('explicit templates', () => {
+            it('should create embedded templates for <template> elements', () => {
+              expect(humanizeTplAst(parse('<template></template>', [
+              ]))).toEqual([[EmbeddedTemplateAst]]);
+              expect(humanizeTplAst(parse('<TEMPLATE></TEMPLATE>', [
+              ]))).toEqual([[EmbeddedTemplateAst]]);
+            });
 
-        it('should support references via ref-...', () => {
-          expect(humanizeTplAst(parse('<template ref-a>', []))).toEqual([
-            [EmbeddedTemplateAst],
-            [ReferenceAst, 'a', resolveIdentifierToken(Identifiers.TemplateRef)]
-          ]);
-        });
+            it('should create embedded templates for <template> elements regardless the namespace',
+               () => {
+                 expect(humanizeTplAst(parse('<svg><template></template></svg>', []))).toEqual([
+                   [ElementAst, ':svg:svg'],
+                   [EmbeddedTemplateAst],
+                 ]);
+               });
 
-        it('should parse variables via let-...', () => {
-          expect(humanizeTplAst(parse('<template let-a="b">', [
-          ]))).toEqual([[EmbeddedTemplateAst], [VariableAst, 'a', 'b']]);
-        });
+            it('should support references via #...', () => {
+              expect(humanizeTplAst(parse('<template #a>', []))).toEqual([
+                [EmbeddedTemplateAst],
+                [ReferenceAst, 'a', resolveIdentifierToken(Identifiers.TemplateRef)]
+              ]);
+            });
 
-        it('should not locate directives in variables', () => {
-          var dirA = CompileDirectiveMetadata.create({
-            selector: '[a]',
-            type: new CompileTypeMetadata(
-                {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>})
-          });
-          expect(humanizeTplAst(parse('<template let-a="b"></template>', [dirA]))).toEqual([
-            [EmbeddedTemplateAst], [VariableAst, 'a', 'b']
-          ]);
-        });
+            it('should support references via ref-...', () => {
+              expect(humanizeTplAst(parse('<template ref-a>', []))).toEqual([
+                [EmbeddedTemplateAst],
+                [ReferenceAst, 'a', resolveIdentifierToken(Identifiers.TemplateRef)]
+              ]);
+            });
 
-      });
+            it('should parse variables via let-...', () => {
+              expect(humanizeTplAst(parse('<template let-a="b">', [
+              ]))).toEqual([[EmbeddedTemplateAst], [VariableAst, 'a', 'b']]);
+            });
 
-      describe('inline templates', () => {
-        it('should wrap the element into an EmbeddedTemplateAST', () => {
-          expect(humanizeTplAst(parse('<div template>', [
-          ]))).toEqual([[EmbeddedTemplateAst], [ElementAst, 'div']]);
-        });
+            it('should not locate directives in variables', () => {
+              var dirA = CompileDirectiveMetadata.create({
+                selector: '[a]',
+                type: new CompileTypeMetadata(
+                    {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>})
+              });
+              expect(humanizeTplAst(parse('<template let-a="b"></template>', [dirA]))).toEqual([
+                [EmbeddedTemplateAst], [VariableAst, 'a', 'b']
+              ]);
+            });
 
-        it('should wrap the element with data-template attribute into an EmbeddedTemplateAST ',
-           () => {
-             expect(humanizeTplAst(parse('<div data-template>', [
-             ]))).toEqual([[EmbeddedTemplateAst], [ElementAst, 'div']]);
-           });
-
-        it('should parse bound properties', () => {
-          expect(humanizeTplAst(parse('<div template="ngIf test">', [ngIf]))).toEqual([
-            [EmbeddedTemplateAst], [DirectiveAst, ngIf],
-            [BoundDirectivePropertyAst, 'ngIf', 'test'], [ElementAst, 'div']
-          ]);
-        });
+          });
 
-        it('should report an error on variables declared with #', () => {
-          expect(() => humanizeTplAst(parse('<div *ngIf="#a=b">', [])))
-              .toThrowError(/Parser Error: Unexpected token # at column 6/);
-        });
+          describe('inline templates', () => {
+            it('should wrap the element into an EmbeddedTemplateAST', () => {
+              expect(humanizeTplAst(parse('<div template>', [
+              ]))).toEqual([[EmbeddedTemplateAst], [ElementAst, 'div']]);
+            });
 
-        it('should parse variables via let ...', () => {
-          expect(humanizeTplAst(parse('<div *ngIf="let a=b">', [
-          ]))).toEqual([[EmbeddedTemplateAst], [VariableAst, 'a', 'b'], [ElementAst, 'div']]);
-        });
+            it('should wrap the element with data-template attribute into an EmbeddedTemplateAST ',
+               () => {
+                 expect(humanizeTplAst(parse('<div data-template>', [
+                 ]))).toEqual([[EmbeddedTemplateAst], [ElementAst, 'div']]);
+               });
 
-        describe('directives', () => {
-          it('should locate directives in property bindings', () => {
-            var dirA = CompileDirectiveMetadata.create({
-              selector: '[a=b]',
-              type: new CompileTypeMetadata(
-                  {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>}),
-              inputs: ['a']
+            it('should parse bound properties', () => {
+              expect(humanizeTplAst(parse('<div template="ngIf test">', [ngIf]))).toEqual([
+                [EmbeddedTemplateAst], [DirectiveAst, ngIf],
+                [BoundDirectivePropertyAst, 'ngIf', 'test'], [ElementAst, 'div']
+              ]);
             });
-            var dirB = CompileDirectiveMetadata.create({
-              selector: '[b]',
-              type: new CompileTypeMetadata(
-                  {moduleUrl: someModuleUrl, name: 'DirB', reference: {} as Type<any>})
+
+            it('should report an error on variables declared with #', () => {
+              expect(() => humanizeTplAst(parse('<div *ngIf="#a=b">', [])))
+                  .toThrowError(/Parser Error: Unexpected token # at column 6/);
             });
-            expect(humanizeTplAst(parse('<div template="a b" b>', [dirA, dirB]))).toEqual([
-              [EmbeddedTemplateAst], [DirectiveAst, dirA], [BoundDirectivePropertyAst, 'a', 'b'],
-              [ElementAst, 'div'], [AttrAst, 'b', ''], [DirectiveAst, dirB]
-            ]);
-          });
 
-          it('should not locate directives in variables', () => {
-            var dirA = CompileDirectiveMetadata.create({
-              selector: '[a]',
-              type: new CompileTypeMetadata(
-                  {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>})
+            it('should parse variables via let ...', () => {
+              expect(humanizeTplAst(parse('<div *ngIf="let a=b">', [
+              ]))).toEqual([[EmbeddedTemplateAst], [VariableAst, 'a', 'b'], [ElementAst, 'div']]);
             });
-            expect(humanizeTplAst(parse('<div template="let a=b">', [dirA]))).toEqual([
-              [EmbeddedTemplateAst], [VariableAst, 'a', 'b'], [ElementAst, 'div']
-            ]);
-          });
 
-          it('should not locate directives in references', () => {
-            var dirA = CompileDirectiveMetadata.create({
-              selector: '[a]',
-              type: new CompileTypeMetadata(
-                  {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>})
+            describe('directives', () => {
+              it('should locate directives in property bindings', () => {
+                var dirA = CompileDirectiveMetadata.create({
+                  selector: '[a=b]',
+                  type: new CompileTypeMetadata(
+                      {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>}),
+                  inputs: ['a']
+                });
+                var dirB = CompileDirectiveMetadata.create({
+                  selector: '[b]',
+                  type: new CompileTypeMetadata(
+                      {moduleUrl: someModuleUrl, name: 'DirB', reference: {} as Type<any>})
+                });
+                expect(humanizeTplAst(parse('<div template="a b" b>', [dirA, dirB]))).toEqual([
+                  [EmbeddedTemplateAst], [DirectiveAst, dirA],
+                  [BoundDirectivePropertyAst, 'a', 'b'], [ElementAst, 'div'], [AttrAst, 'b', ''],
+                  [DirectiveAst, dirB]
+                ]);
+              });
+
+              it('should not locate directives in variables', () => {
+                var dirA = CompileDirectiveMetadata.create({
+                  selector: '[a]',
+                  type: new CompileTypeMetadata(
+                      {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>})
+                });
+                expect(humanizeTplAst(parse('<div template="let a=b">', [dirA]))).toEqual([
+                  [EmbeddedTemplateAst], [VariableAst, 'a', 'b'], [ElementAst, 'div']
+                ]);
+              });
+
+              it('should not locate directives in references', () => {
+                var dirA = CompileDirectiveMetadata.create({
+                  selector: '[a]',
+                  type: new CompileTypeMetadata(
+                      {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>})
+                });
+                expect(humanizeTplAst(parse('<div ref-a>', [dirA]))).toEqual([
+                  [ElementAst, 'div'], [ReferenceAst, 'a', null]
+                ]);
+              });
+
             });
-            expect(humanizeTplAst(parse('<div ref-a>', [dirA]))).toEqual([
-              [ElementAst, 'div'], [ReferenceAst, 'a', null]
-            ]);
-          });
 
-        });
+            it('should work with *... and use the attribute name as property binding name', () => {
+              expect(humanizeTplAst(parse('<div *ngIf="test">', [ngIf]))).toEqual([
+                [EmbeddedTemplateAst], [DirectiveAst, ngIf],
+                [BoundDirectivePropertyAst, 'ngIf', 'test'], [ElementAst, 'div']
+              ]);
+            });
 
-        it('should work with *... and use the attribute name as property binding name', () => {
-          expect(humanizeTplAst(parse('<div *ngIf="test">', [ngIf]))).toEqual([
-            [EmbeddedTemplateAst], [DirectiveAst, ngIf],
-            [BoundDirectivePropertyAst, 'ngIf', 'test'], [ElementAst, 'div']
-          ]);
+            it('should work with *... and empty value', () => {
+              expect(humanizeTplAst(parse('<div *ngIf>', [ngIf]))).toEqual([
+                [EmbeddedTemplateAst], [DirectiveAst, ngIf],
+                [BoundDirectivePropertyAst, 'ngIf', 'null'], [ElementAst, 'div']
+              ]);
+            });
+          });
         });
 
-        it('should work with *... and empty value', () => {
-          expect(humanizeTplAst(parse('<div *ngIf>', [ngIf]))).toEqual([
-            [EmbeddedTemplateAst], [DirectiveAst, ngIf],
-            [BoundDirectivePropertyAst, 'ngIf', 'null'], [ElementAst, 'div']
-          ]);
-        });
-      });
-    });
+        describe('content projection', () => {
+          var compCounter: any /** TODO #9100 */;
+          beforeEach(() => { compCounter = 0; });
+
+          function createComp(
+              selector: string, ngContentSelectors: string[]): CompileDirectiveMetadata {
+            return CompileDirectiveMetadata.create({
+              selector: selector,
+              isComponent: true,
+              type: new CompileTypeMetadata({
+                moduleUrl: someModuleUrl,
+                name: `SomeComp${compCounter++}`,
+                reference: {} as Type<any>
+              }),
+              template: new CompileTemplateMetadata({ngContentSelectors: ngContentSelectors})
+            });
+          }
 
-    describe('content projection', () => {
-      var compCounter: any /** TODO #9100 */;
-      beforeEach(() => { compCounter = 0; });
-
-      function createComp(
-          selector: string, ngContentSelectors: string[]): CompileDirectiveMetadata {
-        return CompileDirectiveMetadata.create({
-          selector: selector,
-          isComponent: true,
-          type: new CompileTypeMetadata({
-            moduleUrl: someModuleUrl,
-            name: `SomeComp${compCounter++}`,
-            reference: {} as Type<any>
-          }),
-          template: new CompileTemplateMetadata({ngContentSelectors: ngContentSelectors})
-        });
-      }
+          function createDir(selector: string): CompileDirectiveMetadata {
+            return CompileDirectiveMetadata.create({
+              selector: selector,
+              type: new CompileTypeMetadata({
+                moduleUrl: someModuleUrl,
+                name: `SomeDir${compCounter++}`,
+                reference: {} as Type<any>
+              })
+            });
+          }
 
-      function createDir(selector: string): CompileDirectiveMetadata {
-        return CompileDirectiveMetadata.create({
-          selector: selector,
-          type: new CompileTypeMetadata({
-            moduleUrl: someModuleUrl,
-            name: `SomeDir${compCounter++}`,
-            reference: {} as Type<any>
-          })
-        });
-      }
+          describe('project text nodes', () => {
+            it('should project text nodes with wildcard selector', () => {
+              expect(humanizeContentProjection(parse('<div>hello</div>', [
+                createComp('div', ['*'])
+              ]))).toEqual([['div', null], ['#text(hello)', 0]]);
+            });
+          });
 
-      describe('project text nodes', () => {
-        it('should project text nodes with wildcard selector', () => {
-          expect(humanizeContentProjection(parse('<div>hello</div>', [createComp('div', ['*'])])))
-              .toEqual([['div', null], ['#text(hello)', 0]]);
-        });
-      });
+          describe('project elements', () => {
+            it('should project elements with wildcard selector', () => {
+              expect(humanizeContentProjection(parse('<div><span></span></div>', [
+                createComp('div', ['*'])
+              ]))).toEqual([['div', null], ['span', 0]]);
+            });
 
-      describe('project elements', () => {
-        it('should project elements with wildcard selector', () => {
-          expect(humanizeContentProjection(parse('<div><span></span></div>', [
-            createComp('div', ['*'])
-          ]))).toEqual([['div', null], ['span', 0]]);
-        });
+            it('should project elements with css selector', () => {
+              expect(humanizeContentProjection(parse('<div><a x></a><b></b></div>', [
+                createComp('div', ['a[x]'])
+              ]))).toEqual([['div', null], ['a', 0], ['b', null]]);
+            });
+          });
 
-        it('should project elements with css selector', () => {
-          expect(humanizeContentProjection(parse('<div><a x></a><b></b></div>', [
-            createComp('div', ['a[x]'])
-          ]))).toEqual([['div', null], ['a', 0], ['b', null]]);
-        });
-      });
+          describe('embedded templates', () => {
+            it('should project embedded templates with wildcard selector', () => {
+              expect(humanizeContentProjection(parse('<div><template></template></div>', [
+                createComp('div', ['*'])
+              ]))).toEqual([['div', null], ['template', 0]]);
+            });
 
-      describe('embedded templates', () => {
-        it('should project embedded templates with wildcard selector', () => {
-          expect(humanizeContentProjection(parse('<div><template></template></div>', [
-            createComp('div', ['*'])
-          ]))).toEqual([['div', null], ['template', 0]]);
-        });
+            it('should project embedded templates with css selector', () => {
+              expect(humanizeContentProjection(parse(
+                         '<div><template x></template><template></template></div>',
+                         [createComp('div', ['template[x]'])])))
+                  .toEqual([['div', null], ['template', 0], ['template', null]]);
+            });
+          });
 
-        it('should project embedded templates with css selector', () => {
-          expect(humanizeContentProjection(parse(
-                     '<div><template x></template><template></template></div>',
-                     [createComp('div', ['template[x]'])])))
-              .toEqual([['div', null], ['template', 0], ['template', null]]);
-        });
-      });
+          describe('ng-content', () => {
+            it('should project ng-content with wildcard selector', () => {
+              expect(humanizeContentProjection(parse('<div><ng-content></ng-content></div>', [
+                createComp('div', ['*'])
+              ]))).toEqual([['div', null], ['ng-content', 0]]);
+            });
 
-      describe('ng-content', () => {
-        it('should project ng-content with wildcard selector', () => {
-          expect(humanizeContentProjection(parse('<div><ng-content></ng-content></div>', [
-            createComp('div', ['*'])
-          ]))).toEqual([['div', null], ['ng-content', 0]]);
-        });
+            it('should project ng-content with css selector', () => {
+              expect(humanizeContentProjection(parse(
+                         '<div><ng-content x></ng-content><ng-content></ng-content></div>',
+                         [createComp('div', ['ng-content[x]'])])))
+                  .toEqual([['div', null], ['ng-content', 0], ['ng-content', null]]);
+            });
+          });
 
-        it('should project ng-content with css selector', () => {
-          expect(humanizeContentProjection(parse(
-                     '<div><ng-content x></ng-content><ng-content></ng-content></div>',
-                     [createComp('div', ['ng-content[x]'])])))
-              .toEqual([['div', null], ['ng-content', 0], ['ng-content', null]]);
-        });
-      });
+          it('should project into the first matching ng-content', () => {
+            expect(humanizeContentProjection(parse('<div>hello<b></b><a></a></div>', [
+              createComp('div', ['a', 'b', '*'])
+            ]))).toEqual([['div', null], ['#text(hello)', 2], ['b', 1], ['a', 0]]);
+          });
 
-      it('should project into the first matching ng-content', () => {
-        expect(humanizeContentProjection(parse('<div>hello<b></b><a></a></div>', [
-          createComp('div', ['a', 'b', '*'])
-        ]))).toEqual([['div', null], ['#text(hello)', 2], ['b', 1], ['a', 0]]);
-      });
+          it('should project into wildcard ng-content last', () => {
+            expect(humanizeContentProjection(parse('<div>hello<a></a></div>', [
+              createComp('div', ['*', 'a'])
+            ]))).toEqual([['div', null], ['#text(hello)', 0], ['a', 1]]);
+          });
 
-      it('should project into wildcard ng-content last', () => {
-        expect(humanizeContentProjection(parse('<div>hello<a></a></div>', [
-          createComp('div', ['*', 'a'])
-        ]))).toEqual([['div', null], ['#text(hello)', 0], ['a', 1]]);
-      });
+          it('should only project direct child nodes', () => {
+            expect(humanizeContentProjection(parse('<div><span><a></a></span><a></a></div>', [
+              createComp('div', ['a'])
+            ]))).toEqual([['div', null], ['span', null], ['a', null], ['a', 0]]);
+          });
 
-      it('should only project direct child nodes', () => {
-        expect(humanizeContentProjection(parse('<div><span><a></a></span><a></a></div>', [
-          createComp('div', ['a'])
-        ]))).toEqual([['div', null], ['span', null], ['a', null], ['a', 0]]);
-      });
+          it('should project nodes of nested components', () => {
+            expect(humanizeContentProjection(parse('<a><b>hello</b></a>', [
+              createComp('a', ['*']), createComp('b', ['*'])
+            ]))).toEqual([['a', null], ['b', 0], ['#text(hello)', 0]]);
+          });
 
-      it('should project nodes of nested components', () => {
-        expect(humanizeContentProjection(parse('<a><b>hello</b></a>', [
-          createComp('a', ['*']), createComp('b', ['*'])
-        ]))).toEqual([['a', null], ['b', 0], ['#text(hello)', 0]]);
-      });
+          it('should project children of components with ngNonBindable', () => {
+            expect(
+                humanizeContentProjection(parse(
+                    '<div ngNonBindable>{{hello}}<span></span></div>', [createComp('div', ['*'])])))
+                .toEqual([['div', null], ['#text({{hello}})', 0], ['span', 0]]);
+          });
 
-      it('should project children of components with ngNonBindable', () => {
-        expect(humanizeContentProjection(parse('<div ngNonBindable>{{hello}}<span></span></div>', [
-          createComp('div', ['*'])
-        ]))).toEqual([['div', null], ['#text({{hello}})', 0], ['span', 0]]);
-      });
+          it('should match the element when there is an inline template', () => {
+            expect(humanizeContentProjection(parse('<div><b *ngIf="cond"></b></div>', [
+              createComp('div', ['a', 'b']), ngIf
+            ]))).toEqual([['div', null], ['template', 1], ['b', null]]);
+          });
 
-      it('should match the element when there is an inline template', () => {
-        expect(humanizeContentProjection(parse('<div><b *ngIf="cond"></b></div>', [
-          createComp('div', ['a', 'b']), ngIf
-        ]))).toEqual([['div', null], ['template', 1], ['b', null]]);
-      });
+          describe('ngProjectAs', () => {
+            it('should override elements', () => {
+              expect(humanizeContentProjection(parse('<div><a ngProjectAs="b"></a></div>', [
+                createComp('div', ['a', 'b'])
+              ]))).toEqual([['div', null], ['a', 1]]);
+            });
 
-      describe('ngProjectAs', () => {
-        it('should override elements', () => {
-          expect(humanizeContentProjection(parse('<div><a ngProjectAs="b"></a></div>', [
-            createComp('div', ['a', 'b'])
-          ]))).toEqual([['div', null], ['a', 1]]);
-        });
+            it('should override <ng-content>', () => {
+              expect(humanizeContentProjection(parse(
+                         '<div><ng-content ngProjectAs="b"></ng-content></div>',
+                         [createComp('div', ['ng-content', 'b'])])))
+                  .toEqual([['div', null], ['ng-content', 1]]);
+            });
 
-        it('should override <ng-content>', () => {
-          expect(humanizeContentProjection(parse(
-                     '<div><ng-content ngProjectAs="b"></ng-content></div>',
-                     [createComp('div', ['ng-content', 'b'])])))
-              .toEqual([['div', null], ['ng-content', 1]]);
-        });
+            it('should override <template>', () => {
+              expect(humanizeContentProjection(parse(
+                         '<div><template ngProjectAs="b"></template></div>',
+                         [createComp('div', ['template', 'b'])])))
+                  .toEqual([['div', null], ['template', 1]]);
+            });
 
-        it('should override <template>', () => {
-          expect(humanizeContentProjection(parse(
-                     '<div><template ngProjectAs="b"></template></div>',
-                     [createComp('div', ['template', 'b'])])))
-              .toEqual([['div', null], ['template', 1]]);
-        });
+            it('should override inline templates', () => {
+              expect(humanizeContentProjection(parse(
+                         '<div><a *ngIf="cond" ngProjectAs="b"></a></div>',
+                         [createComp('div', ['a', 'b']), ngIf])))
+                  .toEqual([['div', null], ['template', 1], ['a', null]]);
+            });
+          });
 
-        it('should override inline templates', () => {
-          expect(humanizeContentProjection(parse(
-                     '<div><a *ngIf="cond" ngProjectAs="b"></a></div>',
-                     [createComp('div', ['a', 'b']), ngIf])))
-              .toEqual([['div', null], ['template', 1], ['a', null]]);
+          it('should support other directives before the component', () => {
+            expect(humanizeContentProjection(parse('<div>hello</div>', [
+              createDir('div'), createComp('div', ['*'])
+            ]))).toEqual([['div', null], ['#text(hello)', 0]]);
+          });
         });
-      });
 
-      it('should support other directives before the component', () => {
-        expect(humanizeContentProjection(parse('<div>hello</div>', [
-          createDir('div'), createComp('div', ['*'])
-        ]))).toEqual([['div', null], ['#text(hello)', 0]]);
-      });
-    });
-
-    describe('splitClasses', () => {
-      it('should keep an empty class', () => { expect(splitClasses('a')).toEqual(['a']); });
+        describe('splitClasses', () => {
+          it('should keep an empty class', () => { expect(splitClasses('a')).toEqual(['a']); });
 
-      it('should split 2 classes', () => { expect(splitClasses('a b')).toEqual(['a', 'b']); });
+          it('should split 2 classes', () => { expect(splitClasses('a b')).toEqual(['a', 'b']); });
 
-      it('should trim classes', () => { expect(splitClasses(' a  b ')).toEqual(['a', 'b']); });
-    });
+          it('should trim classes', () => { expect(splitClasses(' a  b ')).toEqual(['a', 'b']); });
+        });
 
-    describe('error cases', () => {
-      it('should report when ng-content has content', () => {
-        expect(() => parse('<ng-content>content</ng-content>', []))
-            .toThrowError(`Template parse errors:
+        describe('error cases', () => {
+          it('should report when ng-content has content', () => {
+            expect(() => parse('<ng-content>content</ng-content>', []))
+                .toThrowError(`Template parse errors:
 <ng-content> element cannot have content. <ng-content> must be immediately followed by </ng-content> ("[ERROR ->]<ng-content>content</ng-content>"): TestComp@0:0`);
-      });
+          });
 
-      it('should treat *attr on a template element as valid',
-         () => { expect(() => parse('<template *ngIf>', [])).not.toThrowError(); });
+          it('should treat *attr on a template element as valid',
+             () => { expect(() => parse('<template *ngIf>', [])).not.toThrowError(); });
 
-      it('should treat template attribute on a template element as valid',
-         () => { expect(() => parse('<template template="ngIf">', [])).not.toThrowError(); });
+          it('should treat template attribute on a template element as valid',
+             () => { expect(() => parse('<template template="ngIf">', [])).not.toThrowError(); });
 
-      it('should report when mutliple *attrs are used on the same element', () => {
-        expect(() => parse('<div *ngIf *ngFor>', [])).toThrowError(`Template parse errors:
+          it('should report when mutliple *attrs are used on the same element', () => {
+            expect(() => parse('<div *ngIf *ngFor>', [])).toThrowError(`Template parse errors:
 Can't have multiple template bindings on one element. Use only one attribute named 'template' or prefixed with * ("<div *ngIf [ERROR ->]*ngFor>"): TestComp@0:11`);
-      });
+          });
 
-      it('should report when mix of template and *attrs are used on the same element', () => {
-        expect(() => parse('<span template="ngIf" *ngFor>', []))
-            .toThrowError(`Template parse errors:
+          it('should report when mix of template and *attrs are used on the same element', () => {
+            expect(() => parse('<span template="ngIf" *ngFor>', []))
+                .toThrowError(`Template parse errors:
 Can't have multiple template bindings on one element. Use only one attribute named 'template' or prefixed with * ("<span template="ngIf" [ERROR ->]*ngFor>"): TestComp@0:22`);
-      });
+          });
 
-      it('should report invalid property names', () => {
-        expect(() => parse('<div [invalidProp]></div>', [])).toThrowError(`Template parse errors:
+          it('should report invalid property names', () => {
+            expect(() => parse('<div [invalidProp]></div>', []))
+                .toThrowError(`Template parse errors:
 Can't bind to 'invalidProp' since it isn't a known property of 'div'. ("<div [ERROR ->][invalidProp]></div>"): TestComp@0:5`);
-      });
+          });
 
-      it('should report invalid host property names', () => {
-        var dirA = CompileDirectiveMetadata.create({
-          selector: 'div',
-          type: new CompileTypeMetadata(
-              {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>}),
-          host: {'[invalidProp]': 'someProp'}
-        });
-        expect(() => parse('<div></div>', [dirA])).toThrowError(`Template parse errors:
+          it('should report invalid host property names', () => {
+            var dirA = CompileDirectiveMetadata.create({
+              selector: 'div',
+              type: new CompileTypeMetadata(
+                  {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>}),
+              host: {'[invalidProp]': 'someProp'}
+            });
+            expect(() => parse('<div></div>', [dirA])).toThrowError(`Template parse errors:
 Can't bind to 'invalidProp' since it isn't a known property of 'div'. ("[ERROR ->]<div></div>"): TestComp@0:0, Directive DirA`);
-      });
+          });
 
-      it('should report errors in expressions', () => {
-        expect(() => parse('<div [prop]="a b"></div>', [])).toThrowError(`Template parse errors:
+          it('should report errors in expressions', () => {
+            expect(() => parse('<div [prop]="a b"></div>', [])).toThrowError(`Template parse errors:
 Parser Error: Unexpected token 'b' at column 3 in [a b] in TestComp@0:5 ("<div [ERROR ->][prop]="a b"></div>"): TestComp@0:5`);
-      });
+          });
 
-      it('should not throw on invalid property names if the property is used by a directive',
-         () => {
-           var dirA = CompileDirectiveMetadata.create({
-             selector: 'div',
-             type: new CompileTypeMetadata(
-                 {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>}),
-             inputs: ['invalidProp']
-           });
-           expect(() => parse('<div [invalid-prop]></div>', [dirA])).not.toThrow();
-         });
-
-      it('should not allow more than 1 component per element', () => {
-        var dirA = CompileDirectiveMetadata.create({
-          selector: 'div',
-          isComponent: true,
-          type: new CompileTypeMetadata(
-              {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>}),
-          template: new CompileTemplateMetadata({ngContentSelectors: []})
-        });
-        var dirB = CompileDirectiveMetadata.create({
-          selector: 'div',
-          isComponent: true,
-          type: new CompileTypeMetadata(
-              {moduleUrl: someModuleUrl, name: 'DirB', reference: {} as Type<any>}),
-          template: new CompileTemplateMetadata({ngContentSelectors: []})
-        });
-        expect(() => parse('<div>', [dirB, dirA])).toThrowError(`Template parse errors:
+          it('should not throw on invalid property names if the property is used by a directive',
+             () => {
+               var dirA = CompileDirectiveMetadata.create({
+                 selector: 'div',
+                 type: new CompileTypeMetadata(
+                     {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>}),
+                 inputs: ['invalidProp']
+               });
+               expect(() => parse('<div [invalid-prop]></div>', [dirA])).not.toThrow();
+             });
+
+          it('should not allow more than 1 component per element', () => {
+            var dirA = CompileDirectiveMetadata.create({
+              selector: 'div',
+              isComponent: true,
+              type: new CompileTypeMetadata(
+                  {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>}),
+              template: new CompileTemplateMetadata({ngContentSelectors: []})
+            });
+            var dirB = CompileDirectiveMetadata.create({
+              selector: 'div',
+              isComponent: true,
+              type: new CompileTypeMetadata(
+                  {moduleUrl: someModuleUrl, name: 'DirB', reference: {} as Type<any>}),
+              template: new CompileTemplateMetadata({ngContentSelectors: []})
+            });
+            expect(() => parse('<div>', [dirB, dirA])).toThrowError(`Template parse errors:
 More than one component: DirB,DirA ("[ERROR ->]<div>"): TestComp@0:0`);
-      });
+          });
 
-      it('should not allow components or element bindings nor dom events on explicit embedded templates',
-         () => {
-           var dirA = CompileDirectiveMetadata.create({
-             selector: '[a]',
-             isComponent: true,
-             type: new CompileTypeMetadata(
-                 {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>}),
-             template: new CompileTemplateMetadata({ngContentSelectors: []})
-           });
-           expect(() => parse('<template [a]="b" (e)="f"></template>', [dirA]))
-               .toThrowError(`Template parse errors:
+          it('should not allow components or element bindings nor dom events on explicit embedded templates',
+             () => {
+               var dirA = CompileDirectiveMetadata.create({
+                 selector: '[a]',
+                 isComponent: true,
+                 type: new CompileTypeMetadata(
+                     {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>}),
+                 template: new CompileTemplateMetadata({ngContentSelectors: []})
+               });
+               expect(() => parse('<template [a]="b" (e)="f"></template>', [dirA]))
+                   .toThrowError(`Template parse errors:
 Event binding e not emitted by any directive on an embedded template. Make sure that the event name is spelled correctly and all directives are listed in the "directives" section. ("<template [a]="b" [ERROR ->](e)="f"></template>"): TestComp@0:18
 Components on an embedded template: DirA ("[ERROR ->]<template [a]="b" (e)="f"></template>"): TestComp@0:0
 Property binding a not used by any directive on an embedded template. Make sure that the property name is spelled correctly and all directives are listed in the "directives" section. ("[ERROR ->]<template [a]="b" (e)="f"></template>"): TestComp@0:0`);
-         });
-
-      it('should not allow components or element bindings on inline embedded templates', () => {
-        var dirA = CompileDirectiveMetadata.create({
-          selector: '[a]',
-          isComponent: true,
-          type: new CompileTypeMetadata(
-              {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>}),
-          template: new CompileTemplateMetadata({ngContentSelectors: []})
-        });
-        expect(() => parse('<div *a="b"></div>', [dirA])).toThrowError(`Template parse errors:
+             });
+
+          it('should not allow components or element bindings on inline embedded templates', () => {
+            var dirA = CompileDirectiveMetadata.create({
+              selector: '[a]',
+              isComponent: true,
+              type: new CompileTypeMetadata(
+                  {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>}),
+              template: new CompileTemplateMetadata({ngContentSelectors: []})
+            });
+            expect(() => parse('<div *a="b"></div>', [dirA])).toThrowError(`Template parse errors:
 Components on an embedded template: DirA ("[ERROR ->]<div *a="b"></div>"): TestComp@0:0
 Property binding a not used by any directive on an embedded template. Make sure that the property name is spelled correctly and all directives are listed in the "directives" section. ("[ERROR ->]<div *a="b"></div>"): TestComp@0:0`);
-      });
-    });
+          });
+        });
 
-    describe('ignore elements', () => {
-      it('should ignore <script> elements', () => {
-        expect(humanizeTplAst(parse('<script></script>a', []))).toEqual([[TextAst, 'a']]);
+        describe('ignore elements', () => {
+          it('should ignore <script> elements', () => {
+            expect(humanizeTplAst(parse('<script></script>a', []))).toEqual([[TextAst, 'a']]);
 
-      });
+          });
 
-      it('should ignore <style> elements', () => {
-        expect(humanizeTplAst(parse('<style></style>a', []))).toEqual([[TextAst, 'a']]);
-      });
+          it('should ignore <style> elements', () => {
+            expect(humanizeTplAst(parse('<style></style>a', []))).toEqual([[TextAst, 'a']]);
+          });
 
-      describe('<link rel="stylesheet">', () => {
+          describe('<link rel="stylesheet">', () => {
+
+            it('should keep <link rel="stylesheet"> elements if they have an absolute non package: url',
+               () => {
+                 expect(humanizeTplAst(parse('<link rel="stylesheet" href="http://someurl">a', [])))
+                     .toEqual([
+                       [ElementAst, 'link'], [AttrAst, 'rel', 'stylesheet'],
+                       [AttrAst, 'href', 'http://someurl'], [TextAst, 'a']
+                     ]);
+               });
+
+            it('should keep <link rel="stylesheet"> elements if they have no uri', () => {
+              expect(humanizeTplAst(parse('<link rel="stylesheet">a', [
+              ]))).toEqual([[ElementAst, 'link'], [AttrAst, 'rel', 'stylesheet'], [TextAst, 'a']]);
+              expect(humanizeTplAst(parse('<link REL="stylesheet">a', [
+              ]))).toEqual([[ElementAst, 'link'], [AttrAst, 'REL', 'stylesheet'], [TextAst, 'a']]);
+            });
 
-        it('should keep <link rel="stylesheet"> elements if they have an absolute non package: url',
-           () => {
-             expect(humanizeTplAst(parse('<link rel="stylesheet" href="http://someurl">a', [])))
-                 .toEqual([
-                   [ElementAst, 'link'], [AttrAst, 'rel', 'stylesheet'],
-                   [AttrAst, 'href', 'http://someurl'], [TextAst, 'a']
-                 ]);
-           });
+            it('should ignore <link rel="stylesheet"> elements if they have a relative uri', () => {
+              expect(humanizeTplAst(parse('<link rel="stylesheet" href="./other.css">a', [
+              ]))).toEqual([[TextAst, 'a']]);
+              expect(humanizeTplAst(parse('<link rel="stylesheet" HREF="./other.css">a', [
+              ]))).toEqual([[TextAst, 'a']]);
+            });
 
-        it('should keep <link rel="stylesheet"> elements if they have no uri', () => {
-          expect(humanizeTplAst(parse('<link rel="stylesheet">a', [
-          ]))).toEqual([[ElementAst, 'link'], [AttrAst, 'rel', 'stylesheet'], [TextAst, 'a']]);
-          expect(humanizeTplAst(parse('<link REL="stylesheet">a', [
-          ]))).toEqual([[ElementAst, 'link'], [AttrAst, 'REL', 'stylesheet'], [TextAst, 'a']]);
-        });
+            it('should ignore <link rel="stylesheet"> elements if they have a package: uri', () => {
+              expect(humanizeTplAst(parse('<link rel="stylesheet" href="package:somePackage">a', [
+              ]))).toEqual([[TextAst, 'a']]);
+            });
 
-        it('should ignore <link rel="stylesheet"> elements if they have a relative uri', () => {
-          expect(humanizeTplAst(parse('<link rel="stylesheet" href="./other.css">a', [
-          ]))).toEqual([[TextAst, 'a']]);
-          expect(humanizeTplAst(parse('<link rel="stylesheet" HREF="./other.css">a', [
-          ]))).toEqual([[TextAst, 'a']]);
-        });
+          });
 
-        it('should ignore <link rel="stylesheet"> elements if they have a package: uri', () => {
-          expect(humanizeTplAst(parse('<link rel="stylesheet" href="package:somePackage">a', [
-          ]))).toEqual([[TextAst, 'a']]);
-        });
+          it('should ignore bindings on children of elements with ngNonBindable', () => {
+            expect(humanizeTplAst(parse('<div ngNonBindable>{{b}}</div>', [
+            ]))).toEqual([[ElementAst, 'div'], [AttrAst, 'ngNonBindable', ''], [TextAst, '{{b}}']]);
+          });
 
-      });
+          it('should keep nested children of elements with ngNonBindable', () => {
+            expect(humanizeTplAst(parse('<div ngNonBindable><span>{{b}}</span></div>', [])))
+                .toEqual([
+                  [ElementAst, 'div'], [AttrAst, 'ngNonBindable', ''], [ElementAst, 'span'],
+                  [TextAst, '{{b}}']
+                ]);
+          });
 
-      it('should ignore bindings on children of elements with ngNonBindable', () => {
-        expect(humanizeTplAst(parse('<div ngNonBindable>{{b}}</div>', [
-        ]))).toEqual([[ElementAst, 'div'], [AttrAst, 'ngNonBindable', ''], [TextAst, '{{b}}']]);
-      });
+          it('should ignore <script> elements inside of elements with ngNonBindable', () => {
+            expect(humanizeTplAst(parse('<div ngNonBindable><script></script>a</div>', [
+            ]))).toEqual([[ElementAst, 'div'], [AttrAst, 'ngNonBindable', ''], [TextAst, 'a']]);
+          });
 
-      it('should keep nested children of elements with ngNonBindable', () => {
-        expect(humanizeTplAst(parse('<div ngNonBindable><span>{{b}}</span></div>', []))).toEqual([
-          [ElementAst, 'div'], [AttrAst, 'ngNonBindable', ''], [ElementAst, 'span'],
-          [TextAst, '{{b}}']
-        ]);
-      });
+          it('should ignore <style> elements inside of elements with ngNonBindable', () => {
+            expect(humanizeTplAst(parse('<div ngNonBindable><style></style>a</div>', [
+            ]))).toEqual([[ElementAst, 'div'], [AttrAst, 'ngNonBindable', ''], [TextAst, 'a']]);
+          });
 
-      it('should ignore <script> elements inside of elements with ngNonBindable', () => {
-        expect(humanizeTplAst(parse('<div ngNonBindable><script></script>a</div>', [
-        ]))).toEqual([[ElementAst, 'div'], [AttrAst, 'ngNonBindable', ''], [TextAst, 'a']]);
-      });
+          it('should ignore <link rel="stylesheet"> elements inside of elements with ngNonBindable',
+             () => {
+               expect(humanizeTplAst(parse('<div ngNonBindable><link rel="stylesheet">a</div>', [
+               ]))).toEqual([[ElementAst, 'div'], [AttrAst, 'ngNonBindable', ''], [TextAst, 'a']]);
+             });
 
-      it('should ignore <style> elements inside of elements with ngNonBindable', () => {
-        expect(humanizeTplAst(parse('<div ngNonBindable><style></style>a</div>', [
-        ]))).toEqual([[ElementAst, 'div'], [AttrAst, 'ngNonBindable', ''], [TextAst, 'a']]);
-      });
+          it('should convert <ng-content> elements into regular elements inside of elements with ngNonBindable',
+             () => {
+               expect(
+                   humanizeTplAst(parse('<div ngNonBindable><ng-content></ng-content>a</div>', [])))
+                   .toEqual([
+                     [ElementAst, 'div'], [AttrAst, 'ngNonBindable', ''],
+                     [ElementAst, 'ng-content'], [TextAst, 'a']
+                   ]);
+             });
 
-      it('should ignore <link rel="stylesheet"> elements inside of elements with ngNonBindable',
-         () => {
-           expect(humanizeTplAst(parse('<div ngNonBindable><link rel="stylesheet">a</div>', [
-           ]))).toEqual([[ElementAst, 'div'], [AttrAst, 'ngNonBindable', ''], [TextAst, 'a']]);
-         });
-
-      it('should convert <ng-content> elements into regular elements inside of elements with ngNonBindable',
-         () => {
-           expect(humanizeTplAst(parse('<div ngNonBindable><ng-content></ng-content>a</div>', [])))
-               .toEqual([
-                 [ElementAst, 'div'], [AttrAst, 'ngNonBindable', ''], [ElementAst, 'ng-content'],
-                 [TextAst, 'a']
-               ]);
-         });
+        });
 
-    });
+        describe('source spans', () => {
+          it('should support ng-content', () => {
+            var parsed = parse('<ng-content select="a">', []);
+            expect(humanizeTplAstSourceSpans(parsed)).toEqual([
+              [NgContentAst, '<ng-content select="a">']
+            ]);
+          });
 
-    describe('source spans', () => {
-      it('should support ng-content', () => {
-        var parsed = parse('<ng-content select="a">', []);
-        expect(humanizeTplAstSourceSpans(parsed)).toEqual([
-          [NgContentAst, '<ng-content select="a">']
-        ]);
-      });
+          it('should support embedded template', () => {
+            expect(humanizeTplAstSourceSpans(parse('<template></template>', [
+            ]))).toEqual([[EmbeddedTemplateAst, '<template>']]);
 
-      it('should support embedded template', () => {
-        expect(humanizeTplAstSourceSpans(parse('<template></template>', [
-        ]))).toEqual([[EmbeddedTemplateAst, '<template>']]);
+          });
 
-      });
+          it('should support element and attributes', () => {
+            expect(humanizeTplAstSourceSpans(parse('<div key=value>', []))).toEqual([
+              [ElementAst, 'div', '<div key=value>'], [AttrAst, 'key', 'value', 'key=value']
+            ]);
 
-      it('should support element and attributes', () => {
-        expect(humanizeTplAstSourceSpans(parse('<div key=value>', []))).toEqual([
-          [ElementAst, 'div', '<div key=value>'], [AttrAst, 'key', 'value', 'key=value']
-        ]);
+          });
 
-      });
+          it('should support references', () => {
+            expect(humanizeTplAstSourceSpans(parse('<div #a></div>', [
+            ]))).toEqual([[ElementAst, 'div', '<div #a>'], [ReferenceAst, 'a', null, '#a']]);
+          });
 
-      it('should support references', () => {
-        expect(humanizeTplAstSourceSpans(parse('<div #a></div>', [
-        ]))).toEqual([[ElementAst, 'div', '<div #a>'], [ReferenceAst, 'a', null, '#a']]);
-      });
+          it('should support variables', () => {
+            expect(humanizeTplAstSourceSpans(parse('<template let-a="b"></template>', [])))
+                .toEqual([
+                  [EmbeddedTemplateAst, '<template let-a="b">'],
+                  [VariableAst, 'a', 'b', 'let-a="b"']
+                ]);
+          });
 
-      it('should support variables', () => {
-        expect(humanizeTplAstSourceSpans(parse('<template let-a="b"></template>', []))).toEqual([
-          [EmbeddedTemplateAst, '<template let-a="b">'], [VariableAst, 'a', 'b', 'let-a="b"']
-        ]);
-      });
+          it('should support events', () => {
+            expect(humanizeTplAstSourceSpans(parse('<div (window:event)="v">', []))).toEqual([
+              [ElementAst, 'div', '<div (window:event)="v">'],
+              [BoundEventAst, 'event', 'window', 'v', '(window:event)="v"']
+            ]);
 
-      it('should support events', () => {
-        expect(humanizeTplAstSourceSpans(parse('<div (window:event)="v">', []))).toEqual([
-          [ElementAst, 'div', '<div (window:event)="v">'],
-          [BoundEventAst, 'event', 'window', 'v', '(window:event)="v"']
-        ]);
+          });
 
-      });
+          it('should support element property', () => {
+            expect(humanizeTplAstSourceSpans(parse('<div [someProp]="v">', []))).toEqual([
+              [ElementAst, 'div', '<div [someProp]="v">'],
+              [
+                BoundElementPropertyAst, PropertyBindingType.Property, 'someProp', 'v', null,
+                '[someProp]="v"'
+              ]
+            ]);
+          });
 
-      it('should support element property', () => {
-        expect(humanizeTplAstSourceSpans(parse('<div [someProp]="v">', []))).toEqual([
-          [ElementAst, 'div', '<div [someProp]="v">'],
-          [
-            BoundElementPropertyAst, PropertyBindingType.Property, 'someProp', 'v', null,
-            '[someProp]="v"'
-          ]
-        ]);
-      });
+          it('should support bound text', () => {
+            expect(humanizeTplAstSourceSpans(parse('{{a}}', [
+            ]))).toEqual([[BoundTextAst, '{{ a }}', '{{a}}']]);
+          });
 
-      it('should support bound text', () => {
-        expect(humanizeTplAstSourceSpans(parse('{{a}}', [
-        ]))).toEqual([[BoundTextAst, '{{ a }}', '{{a}}']]);
-      });
+          it('should support text nodes', () => {
+            expect(humanizeTplAstSourceSpans(parse('a', []))).toEqual([[TextAst, 'a', 'a']]);
+          });
 
-      it('should support text nodes', () => {
-        expect(humanizeTplAstSourceSpans(parse('a', []))).toEqual([[TextAst, 'a', 'a']]);
-      });
+          it('should support directive', () => {
+            var dirA = CompileDirectiveMetadata.create({
+              selector: '[a]',
+              type: new CompileTypeMetadata(
+                  {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>})
+            });
+            var comp = CompileDirectiveMetadata.create({
+              selector: 'div',
+              isComponent: true,
+              type: new CompileTypeMetadata(
+                  {moduleUrl: someModuleUrl, name: 'ZComp', reference: {} as Type<any>}),
+              template: new CompileTemplateMetadata({ngContentSelectors: []})
+            });
+            expect(humanizeTplAstSourceSpans(parse('<div a>', [dirA, comp]))).toEqual([
+              [ElementAst, 'div', '<div a>'], [AttrAst, 'a', '', 'a'],
+              [DirectiveAst, dirA, '<div a>'], [DirectiveAst, comp, '<div a>']
+            ]);
+          });
 
-      it('should support directive', () => {
-        var dirA = CompileDirectiveMetadata.create({
-          selector: '[a]',
-          type: new CompileTypeMetadata(
-              {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>})
-        });
-        var comp = CompileDirectiveMetadata.create({
-          selector: 'div',
-          isComponent: true,
-          type: new CompileTypeMetadata(
-              {moduleUrl: someModuleUrl, name: 'ZComp', reference: {} as Type<any>}),
-          template: new CompileTemplateMetadata({ngContentSelectors: []})
-        });
-        expect(humanizeTplAstSourceSpans(parse('<div a>', [dirA, comp]))).toEqual([
-          [ElementAst, 'div', '<div a>'], [AttrAst, 'a', '', 'a'], [DirectiveAst, dirA, '<div a>'],
-          [DirectiveAst, comp, '<div a>']
-        ]);
-      });
+          it('should support directive in namespace', () => {
+            var tagSel = CompileDirectiveMetadata.create({
+              selector: 'circle',
+              type: new CompileTypeMetadata(
+                  {moduleUrl: someModuleUrl, name: 'elDir', reference: {} as Type<any>})
+            });
+            var attrSel = CompileDirectiveMetadata.create({
+              selector: '[href]',
+              type: new CompileTypeMetadata(
+                  {moduleUrl: someModuleUrl, name: 'attrDir', reference: {} as Type<any>})
+            });
 
-      it('should support directive in namespace', () => {
-        var tagSel = CompileDirectiveMetadata.create({
-          selector: 'circle',
-          type: new CompileTypeMetadata(
-              {moduleUrl: someModuleUrl, name: 'elDir', reference: {} as Type<any>})
-        });
-        var attrSel = CompileDirectiveMetadata.create({
-          selector: '[href]',
-          type: new CompileTypeMetadata(
-              {moduleUrl: someModuleUrl, name: 'attrDir', reference: {} as Type<any>})
-        });
+            expect(humanizeTplAstSourceSpans(
+                       parse('<svg><circle /><use xlink:href="Port" /></svg>', [tagSel, attrSel])))
+                .toEqual([
+                  [ElementAst, ':svg:svg', '<svg>'],
+                  [ElementAst, ':svg:circle', '<circle />'],
+                  [DirectiveAst, tagSel, '<circle />'],
+                  [ElementAst, ':svg:use', '<use xlink:href="Port" />'],
+                  [AttrAst, ':xlink:href', 'Port', 'xlink:href="Port"'],
+                  [DirectiveAst, attrSel, '<use xlink:href="Port" />'],
+                ]);
+          });
 
-        expect(humanizeTplAstSourceSpans(
-                   parse('<svg><circle /><use xlink:href="Port" /></svg>', [tagSel, attrSel])))
-            .toEqual([
-              [ElementAst, ':svg:svg', '<svg>'],
-              [ElementAst, ':svg:circle', '<circle />'],
-              [DirectiveAst, tagSel, '<circle />'],
-              [ElementAst, ':svg:use', '<use xlink:href="Port" />'],
-              [AttrAst, ':xlink:href', 'Port', 'xlink:href="Port"'],
-              [DirectiveAst, attrSel, '<use xlink:href="Port" />'],
+          it('should support directive property', () => {
+            var dirA = CompileDirectiveMetadata.create({
+              selector: 'div',
+              type: new CompileTypeMetadata(
+                  {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>}),
+              inputs: ['aProp']
+            });
+            expect(humanizeTplAstSourceSpans(parse('<div [aProp]="foo"></div>', [dirA]))).toEqual([
+              [ElementAst, 'div', '<div [aProp]="foo">'],
+              [DirectiveAst, dirA, '<div [aProp]="foo">'],
+              [BoundDirectivePropertyAst, 'aProp', 'foo', '[aProp]="foo"']
             ]);
-      });
+          });
 
-      it('should support directive property', () => {
-        var dirA = CompileDirectiveMetadata.create({
-          selector: 'div',
-          type: new CompileTypeMetadata(
-              {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>}),
-          inputs: ['aProp']
         });
-        expect(humanizeTplAstSourceSpans(parse('<div [aProp]="foo"></div>', [dirA]))).toEqual([
-          [ElementAst, 'div', '<div [aProp]="foo">'], [DirectiveAst, dirA, '<div [aProp]="foo">'],
-          [BoundDirectivePropertyAst, 'aProp', 'foo', '[aProp]="foo"']
-        ]);
-      });
 
-    });
-
-    describe('pipes', () => {
-      it('should allow pipes that have been defined as dependencies', () => {
-        var testPipe = new CompilePipeMetadata({
-          name: 'test',
-          type: new CompileTypeMetadata(
-              {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>})
-        });
-        expect(() => parse('{{a | test}}', [], [testPipe])).not.toThrow();
-      });
+        describe('pipes', () => {
+          it('should allow pipes that have been defined as dependencies', () => {
+            var testPipe = new CompilePipeMetadata({
+              name: 'test',
+              type: new CompileTypeMetadata(
+                  {moduleUrl: someModuleUrl, name: 'DirA', reference: {} as Type<any>})
+            });
+            expect(() => parse('{{a | test}}', [], [testPipe])).not.toThrow();
+          });
 
-      it('should report pipes as error that have not been defined as dependencies', () => {
-        expect(() => parse('{{a | test}}', [])).toThrowError(`Template parse errors:
+          it('should report pipes as error that have not been defined as dependencies', () => {
+            expect(() => parse('{{a | test}}', [])).toThrowError(`Template parse errors:
 The pipe 'test' could not be found ("[ERROR ->]{{a | test}}"): TestComp@0:0`);
-      });
+          });
 
-    });
+        });
 
-    describe('ICU messages', () => {
-      it('should expand plural messages', () => {
-        const shortForm = '{ count, plural, =0 {small} many {big} }';
-        const expandedForm = '<ng-container [ngPlural]="count">' +
-            '<template ngPluralCase="=0">small</template>' +
-            '<template ngPluralCase="many">big</template>' +
-            '</ng-container>';
+        describe('ICU messages', () => {
+          it('should expand plural messages', () => {
+            const shortForm = '{ count, plural, =0 {small} many {big} }';
+            const expandedForm = '<ng-container [ngPlural]="count">' +
+                '<template ngPluralCase="=0">small</template>' +
+                '<template ngPluralCase="many">big</template>' +
+                '</ng-container>';
 
-        expect(humanizeTplAst(parse(shortForm, []))).toEqual(humanizeTplAst(parse(expandedForm, [
-        ])));
-      });
+            expect(humanizeTplAst(parse(shortForm, [
+            ]))).toEqual(humanizeTplAst(parse(expandedForm, [])));
+          });
 
-      it('should expand other messages', () => {
-        const shortForm = '{ sex, gender, =f {foo} other {bar} }';
-        const expandedForm = '<ng-container [ngSwitch]="sex">' +
-            '<template ngSwitchCase="=f">foo</template>' +
-            '<template ngSwitchCase="other">bar</template>' +
-            '</ng-container>';
+          it('should expand other messages', () => {
+            const shortForm = '{ sex, gender, =f {foo} other {bar} }';
+            const expandedForm = '<ng-container [ngSwitch]="sex">' +
+                '<template ngSwitchCase="=f">foo</template>' +
+                '<template ngSwitchCase="other">bar</template>' +
+                '</ng-container>';
 
-        expect(humanizeTplAst(parse(shortForm, []))).toEqual(humanizeTplAst(parse(expandedForm, [
-        ])));
-      });
+            expect(humanizeTplAst(parse(shortForm, [
+            ]))).toEqual(humanizeTplAst(parse(expandedForm, [])));
+          });
 
-      it('should be possible to escape ICU messages', () => {
-        const escapedForm = 'escaped {{ "{" }}  }';
+          it('should be possible to escape ICU messages', () => {
+            const escapedForm = 'escaped {{ "{" }}  }';
 
-        expect(humanizeTplAst(parse(escapedForm, []))).toEqual([
-          [BoundTextAst, 'escaped {{ "{" }}  }'],
-        ]);
+            expect(humanizeTplAst(parse(escapedForm, []))).toEqual([
+              [BoundTextAst, 'escaped {{ "{" }}  }'],
+            ]);
+          });
+        });
       });
-    });
-  });
 }
 
 function humanizeTplAst(
diff --git a/modules/@angular/compiler/testing/schema_registry_mock.ts b/modules/@angular/compiler/testing/schema_registry_mock.ts
index 76a971c57580..bd11e80e5f7c 100644
--- a/modules/@angular/compiler/testing/schema_registry_mock.ts
+++ b/modules/@angular/compiler/testing/schema_registry_mock.ts
@@ -13,7 +13,8 @@ export class MockSchemaRegistry implements ElementSchemaRegistry {
   constructor(
       public existingProperties: {[key: string]: boolean},
       public attrPropMapping: {[key: string]: string},
-      public existingElements: {[key: string]: boolean}) {}
+      public existingElements: {[key: string]: boolean}, public invalidProperties: Array<string>,
+      public invalidAttributes: Array<string>) {}
 
   hasProperty(tagName: string, property: string, schemas: SchemaMetadata[]): boolean {
     const value = this.existingProperties[property];
@@ -32,4 +33,23 @@ export class MockSchemaRegistry implements ElementSchemaRegistry {
   getMappedPropName(attrName: string): string { return this.attrPropMapping[attrName] || attrName; }
 
   getDefaultComponentElementName(): string { return 'ng-component'; }
+
+  validateProperty(name: string): {error: boolean, msg?: string} {
+    if (this.invalidProperties.indexOf(name) > -1) {
+      return {error: true, msg: `Binding to property '${name}' is disallowed for security reasons`};
+    } else {
+      return {error: false};
+    }
+  }
+
+  validateAttribute(name: string): {error: boolean, msg?: string} {
+    if (this.invalidAttributes.indexOf(name) > -1) {
+      return {
+        error: true,
+        msg: `Binding to attribute '${name}' is disallowed for security reasons`
+      };
+    } else {
+      return {error: false};
+    }
+  }
 }
diff --git a/modules/@angular/compiler/testing/test_bindings.ts b/modules/@angular/compiler/testing/test_bindings.ts
index 6f6ef6974c22..94ffc6fcf7b9 100644
--- a/modules/@angular/compiler/testing/test_bindings.ts
+++ b/modules/@angular/compiler/testing/test_bindings.ts
@@ -19,7 +19,7 @@ export function createUrlResolverWithoutPackagePrefix(): UrlResolver {
 // internal test packages.
 // TODO: get rid of it or move to a separate @angular/internal_testing package
 export var TEST_COMPILER_PROVIDERS: Provider[] = [
-  {provide: ElementSchemaRegistry, useValue: new MockSchemaRegistry({}, {}, {})},
+  {provide: ElementSchemaRegistry, useValue: new MockSchemaRegistry({}, {}, {}, [], [])},
   {provide: ResourceLoader, useClass: MockResourceLoader},
   {provide: UrlResolver, useFactory: createUrlResolverWithoutPackagePrefix}
 ];
diff --git a/modules/@angular/core/test/linker/security_integration_spec.ts b/modules/@angular/core/test/linker/security_integration_spec.ts
index 25a298237871..625d50edd087 100644
--- a/modules/@angular/core/test/linker/security_integration_spec.ts
+++ b/modules/@angular/core/test/linker/security_integration_spec.ts
@@ -66,7 +66,7 @@ function declareTests({useJit}: {useJit: boolean}) {
 
         expect(() => TestBed.createComponent(SecuredComponent))
             .toThrowError(
-                /Binding to event attribute 'onclick' is disallowed for security reasons, please use \(click\)=.../);
+                /Binding to event property 'onclick' is disallowed for security reasons, please use \(click\)=.../);
       });
 
       it('should disallow binding to on* unless it is consumed by a directive', () => {

From 830e6352dd11c515916906ec38966b14b29cb96a Mon Sep 17 00:00:00 2001
From: Alex Eagle <eagle@post.harvard.edu>
Date: Tue, 27 Sep 2016 17:12:25 -0700
Subject: [PATCH 31/70] chore(lint): remove unused imports (#11923)

This was done automatically by tslint, which can now fix issues it finds.
The fixer is still pending in PR https://github.com/palantir/tslint/pull/1568
Also I have a local bugfix for https://github.com/palantir/tslint/issues/1569
which causes too many imports to be deleted.
---
 .../@angular/benchpress/src/reporter/console_reporter.ts   | 5 +----
 .../@angular/benchpress/src/reporter/json_file_reporter.ts | 2 +-
 modules/@angular/benchpress/src/runner.ts                  | 2 +-
 modules/@angular/benchpress/src/web_driver_extension.ts    | 2 +-
 .../@angular/benchpress/test/metric/multi_metric_spec.ts   | 2 +-
 .../@angular/benchpress/test/metric/perflog_metric_spec.ts | 2 +-
 .../@angular/benchpress/test/metric/user_metric_spec.ts    | 7 +++----
 .../benchpress/test/reporter/console_reporter_spec.ts      | 2 +-
 .../benchpress/test/reporter/json_file_reporter_spec.ts    | 2 +-
 .../benchpress/test/reporter/multi_reporter_spec.ts        | 2 +-
 modules/@angular/benchpress/test/runner_spec.ts            | 2 +-
 modules/@angular/benchpress/test/sampler_spec.ts           | 2 +-
 modules/@angular/benchpress/test/statistic_spec.ts         | 2 +-
 .../test/validator/regression_slope_validator_spec.ts      | 2 +-
 .../benchpress/test/validator/size_validator_spec.ts       | 2 +-
 .../@angular/benchpress/test/web_driver_extension_spec.ts  | 2 +-
 .../test/webdriver/chrome_driver_extension_spec.ts         | 2 +-
 .../benchpress/test/webdriver/ios_driver_extension_spec.ts | 4 ++--
 modules/@angular/common/test/directives/ng_class_spec.ts   | 2 +-
 modules/@angular/common/test/localization_spec.ts          | 2 +-
 modules/@angular/common/test/pipes/async_pipe_spec.ts      | 2 +-
 modules/@angular/common/test/pipes/date_pipe_spec.ts       | 2 +-
 .../@angular/common/test/pipes/i18n_plural_pipe_spec.ts    | 2 +-
 .../@angular/common/test/pipes/i18n_select_pipe_spec.ts    | 2 +-
 modules/@angular/common/test/pipes/lowercase_pipe_spec.ts  | 2 +-
 modules/@angular/common/test/pipes/number_pipe_spec.ts     | 2 +-
 modules/@angular/common/test/pipes/slice_pipe_spec.ts      | 1 -
 modules/@angular/common/test/pipes/uppercase_pipe_spec.ts  | 2 +-
 modules/@angular/common/test/spies.ts                      | 2 +-
 modules/@angular/compiler-cli/src/static_reflector.ts      | 2 +-
 modules/@angular/compiler/src/compile_metadata.ts          | 5 ++---
 modules/@angular/compiler/src/compiler.ts                  | 2 +-
 modules/@angular/compiler/src/expression_parser/ast.ts     | 2 +-
 modules/@angular/compiler/src/ng_module_compiler.ts        | 2 +-
 modules/@angular/compiler/src/offline_compiler.ts          | 2 +-
 modules/@angular/compiler/src/output/js_emitter.ts         | 2 +-
 modules/@angular/compiler/src/output/output_ast.ts         | 2 --
 modules/@angular/compiler/src/provider_analyzer.ts         | 2 +-
 modules/@angular/compiler/src/runtime_compiler.ts          | 2 +-
 .../@angular/compiler/src/view_compiler/compile_pipe.ts    | 4 ++--
 .../@angular/compiler/src/view_compiler/compile_query.ts   | 2 +-
 .../@angular/compiler/src/view_compiler/compile_view.ts    | 5 ++---
 modules/@angular/compiler/src/view_compiler/constants.ts   | 1 -
 .../@angular/compiler/src/view_compiler/event_binder.ts    | 4 ++--
 modules/@angular/compiler/src/view_compiler/view_binder.ts | 5 ++---
 .../compiler/test/animation/animation_compiler_spec.ts     | 6 ++----
 .../compiler/test/animation/animation_parser_spec.ts       | 7 +++----
 .../@angular/compiler/test/css_parser/css_lexer_spec.ts    | 2 +-
 .../@angular/compiler/test/css_parser/css_parser_spec.ts   | 2 +-
 .../@angular/compiler/test/css_parser/css_visitor_spec.ts  | 4 ++--
 modules/@angular/compiler/test/directive_lifecycle_spec.ts | 2 +-
 .../@angular/compiler/test/directive_normalizer_spec.ts    | 2 +-
 .../@angular/compiler/test/expression_parser/unparser.ts   | 4 ++--
 .../@angular/compiler/test/expression_parser/validator.ts  | 2 +-
 modules/@angular/compiler/test/i18n/digest_spec.ts         | 2 +-
 .../@angular/compiler/test/i18n/extractor_merger_spec.ts   | 2 +-
 modules/@angular/compiler/test/i18n/i18n_parser_spec.ts    | 2 +-
 modules/@angular/compiler/test/i18n/message_bundle_spec.ts | 2 +-
 .../compiler/test/i18n/serializers/placeholder_spec.ts     | 2 +-
 .../@angular/compiler/test/i18n/serializers/xliff_spec.ts  | 2 +-
 .../@angular/compiler/test/i18n/serializers/xmb_spec.ts    | 2 +-
 .../compiler/test/i18n/serializers/xml_helper_spec.ts      | 2 +-
 .../@angular/compiler/test/i18n/serializers/xtb_spec.ts    | 2 +-
 .../compiler/test/ml_parser/ast_serializer_spec.ts         | 2 +-
 .../@angular/compiler/test/ml_parser/html_parser_spec.ts   | 2 +-
 .../compiler/test/ml_parser/icu_ast_expander_spec.ts       | 2 +-
 modules/@angular/compiler/test/ml_parser/lexer_spec.ts     | 2 +-
 .../@angular/compiler/test/ng_module_resolver_mock_spec.ts | 4 +---
 .../@angular/compiler/test/output/abstract_emitter_spec.ts | 2 +-
 modules/@angular/compiler/test/output/js_emitter_spec.ts   | 2 +-
 .../compiler/test/output/output_emitter_codegen_typed.ts   | 2 +-
 .../@angular/compiler/test/output/output_emitter_spec.ts   | 2 +-
 modules/@angular/compiler/test/output/ts_emitter_spec.ts   | 2 +-
 modules/@angular/compiler/test/pipe_resolver_mock_spec.ts  | 4 +---
 .../@angular/compiler/test/resource_loader_mock_spec.ts    | 2 +-
 modules/@angular/compiler/test/runtime_compiler_spec.ts    | 6 +++---
 .../test/schema/dom_element_schema_registry_spec.ts        | 2 +-
 modules/@angular/compiler/test/shadow_css_spec.ts          | 2 +-
 modules/@angular/compiler/test/spies.ts                    | 2 +-
 .../compiler/test/template_parser/template_parser_spec.ts  | 2 +-
 .../test/template_parser/template_preparser_spec.ts        | 2 +-
 modules/@angular/compiler/test/url_resolver_spec.ts        | 2 +-
 modules/@angular/compiler/test/util_spec.ts                | 2 +-
 modules/@angular/core/src/animation/view_animation_map.ts  | 2 +-
 modules/@angular/core/src/linker/view.ts                   | 2 +-
 modules/@angular/core/src/metadata/directives.ts           | 3 +--
 .../test/animation/active_animations_players_map_spec.ts   | 4 +---
 .../core/test/animation/animation_group_player_spec.ts     | 2 +-
 .../@angular/core/test/animation/animation_player_spec.ts  | 4 ++--
 .../core/test/animation/animation_sequence_player_spec.ts  | 3 +--
 .../core/test/animation/animation_style_util_spec.ts       | 2 +-
 modules/@angular/core/test/application_init_spec.ts        | 2 +-
 modules/@angular/core/test/application_module_spec.ts      | 2 +-
 modules/@angular/core/test/application_ref_spec.ts         | 2 +-
 .../test/change_detection/change_detector_util_spec.ts     | 2 +-
 .../differs/default_iterable_differ_spec.ts                | 2 +-
 .../differs/default_keyvalue_differ_spec.ts                | 2 +-
 .../test/change_detection/differs/iterable_differs_spec.ts | 4 ++--
 modules/@angular/core/test/debug/debug_node_spec.ts        | 2 +-
 modules/@angular/core/test/di/forward_ref_spec.ts          | 2 +-
 modules/@angular/core/test/di/injector_spec.ts             | 2 +-
 modules/@angular/core/test/di/reflective_key_spec.ts       | 2 +-
 modules/@angular/core/test/dom/dom_adapter_spec.ts         | 2 +-
 modules/@angular/core/test/dom/shim_spec.ts                | 2 +-
 modules/@angular/core/test/facade/observable_spec.ts       | 2 +-
 modules/@angular/core/test/fake_async_spec.ts              | 2 +-
 .../core/test/linker/change_detection_integration_spec.ts  | 6 +++---
 .../core/test/linker/entry_components_integration_spec.ts  | 2 +-
 modules/@angular/core/test/linker/integration_spec.ts      | 2 +-
 .../core/test/linker/ng_container_integration_spec.ts      | 6 +++---
 .../core/test/linker/projection_integration_spec.ts        | 2 +-
 modules/@angular/core/test/linker/query_list_spec.ts       | 2 +-
 .../core/test/linker/regression_integration_spec.ts        | 2 +-
 .../@angular/core/test/linker/security_integration_spec.ts | 2 +-
 .../test/linker/system_ng_module_factory_loader_spec.ts    | 2 +-
 .../core/test/linker/view_injector_integration_spec.ts     | 6 +++---
 modules/@angular/core/test/metadata/decorators_spec.ts     | 2 +-
 modules/@angular/core/test/reflection/reflector_spec.ts    | 5 ++---
 modules/@angular/core/test/testability/testability_spec.ts | 4 ++--
 modules/@angular/core/test/util/decorators_spec.ts         | 4 ++--
 modules/@angular/core/test/zone/ng_zone_spec.ts            | 2 +-
 modules/@angular/core/testing/test_bed.ts                  | 2 +-
 modules/@angular/examples/common/pipes/ts/async_pipe.ts    | 4 +---
 modules/@angular/examples/common/pipes/ts/date_pipe.ts     | 4 +---
 modules/@angular/examples/common/pipes/ts/i18n_pipe.ts     | 6 +-----
 modules/@angular/examples/common/pipes/ts/json_pipe.ts     | 4 +---
 .../@angular/examples/common/pipes/ts/lowerupper_pipe.ts   | 4 +---
 modules/@angular/examples/common/pipes/ts/number_pipe.ts   | 4 +---
 modules/@angular/examples/common/pipes/ts/slice_pipe.ts    | 4 +---
 .../core/di/ts/contentChild/content_child_howto.ts         | 2 +-
 .../core/di/ts/contentChildren/content_children_howto.ts   | 2 +-
 .../examples/core/di/ts/forward_ref/forward_ref_spec.ts    | 2 +-
 modules/@angular/examples/core/di/ts/provider_spec.ts      | 2 +-
 .../examples/core/di/ts/viewChild/view_child_example.ts    | 2 +-
 .../examples/core/di/ts/viewChild/view_child_howto.ts      | 2 +-
 .../examples/core/ts/metadata/lifecycle_hooks_spec.ts      | 2 +-
 modules/@angular/examples/core/ts/platform/platform.ts     | 3 +--
 .../forms/ts/nestedFormArray/nested_form_array_example.ts  | 2 +-
 modules/@angular/facade/src/collection.ts                  | 2 +-
 modules/@angular/facade/test/async_spec.ts                 | 5 ++---
 .../forms/src/directives/radio_control_value_accessor.ts   | 1 -
 modules/@angular/forms/test/directives_spec.ts             | 2 +-
 modules/@angular/forms/test/form_array_spec.ts             | 2 +-
 modules/@angular/forms/test/form_builder_spec.ts           | 2 +-
 modules/@angular/forms/test/form_control_spec.ts           | 2 +-
 modules/@angular/forms/test/form_group_spec.ts             | 2 +-
 modules/@angular/forms/test/spies.ts                       | 2 +-
 modules/@angular/forms/test/validators_spec.ts             | 2 +-
 modules/@angular/http/src/backends/jsonp_backend.ts        | 2 +-
 modules/@angular/http/src/base_response_options.ts         | 2 +-
 modules/@angular/http/src/http.ts                          | 1 -
 modules/@angular/http/src/static_response.ts               | 3 +--
 modules/@angular/http/test/backends/jsonp_backend_spec.ts  | 3 +--
 modules/@angular/http/test/backends/mock_backend_spec.ts   | 2 +-
 modules/@angular/http/test/backends/xhr_backend_spec.ts    | 2 +-
 modules/@angular/http/test/base_request_options_spec.ts    | 2 +-
 modules/@angular/http/test/headers_spec.ts                 | 2 +-
 modules/@angular/http/test/http_spec.ts                    | 2 +-
 modules/@angular/http/test/url_search_params_spec.ts       | 2 +-
 .../src/platform-browser-dynamic.ts                        | 3 +--
 .../platform-browser-dynamic/src/private_export.ts         | 2 +-
 .../test/resource_loader/resource_loader_impl_spec.ts      | 2 +-
 modules/@angular/platform-browser-dynamic/testing/index.ts | 2 +-
 modules/@angular/platform-browser/src/browser.ts           | 2 +-
 .../platform-browser/src/browser/browser_adapter.ts        | 1 -
 .../src/browser/location/browser_platform_location.ts      | 1 -
 .../@angular/platform-browser/src/browser/testability.ts   | 2 +-
 modules/@angular/platform-browser/src/dom/dom_renderer.ts  | 4 +---
 .../platform-browser/src/dom/web_animations_driver.ts      | 3 +--
 modules/@angular/platform-browser/src/private_export.ts    | 2 +-
 .../platform-browser/test/browser/bootstrap_spec.ts        | 2 +-
 .../platform-browser/test/browser/browser_adapter_spec.ts  | 2 +-
 .../platform-browser/test/browser/tools/tools_spec.ts      | 2 +-
 .../test/dom/dom_renderer_integration_spec.ts              | 2 +-
 .../platform-browser/test/dom/events/event_manager_spec.ts | 2 +-
 .../platform-browser/test/dom/events/key_events_spec.ts    | 2 +-
 .../platform-browser/test/dom/shared_styles_host_spec.ts   | 2 +-
 .../test/dom/web_animations_driver_spec.ts                 | 2 +-
 .../test/dom/web_animations_player_spec.ts                 | 2 +-
 modules/@angular/platform-browser/testing/browser.ts       | 2 +-
 modules/@angular/platform-browser/testing/browser_util.ts  | 2 +-
 modules/@angular/platform-server/src/private_export.ts     | 2 +-
 modules/@angular/platform-server/src/server.ts             | 2 +-
 modules/@angular/platform-server/testing/server.ts         | 2 +-
 .../src/platform-webworker-dynamic.ts                      | 2 +-
 modules/@angular/platform-webworker/src/worker_app.ts      | 2 +-
 modules/@angular/platform-webworker/src/worker_render.ts   | 2 +-
 .../test/web_workers/shared/message_bus_spec.ts            | 2 +-
 .../test/web_workers/shared/service_message_broker_spec.ts | 2 +-
 .../test/web_workers/shared/web_worker_test_util.ts        | 1 -
 .../test/web_workers/worker/platform_location_spec.ts      | 2 +-
 .../platform-webworker/test/web_workers/worker/spies.ts    | 2 +-
 .../@angular/router/src/directives/router_link_active.ts   | 1 -
 modules/@angular/router/src/private_export.ts              | 2 +-
 modules/@angular/router/src/router_state.ts                | 2 +-
 modules/@angular/router/test/create_router_state.spec.ts   | 2 +-
 modules/@angular/router/test/create_url_tree.spec.ts       | 2 +-
 modules/@angular/router/test/url_serializer.spec.ts        | 2 +-
 modules/@angular/router/test/url_tree.spec.ts              | 2 +-
 modules/@angular/upgrade/src/upgrade_adapter.ts            | 2 +-
 modules/@angular/upgrade/test/metadata_spec.ts             | 4 ++--
 modules/@angular/upgrade/test/upgrade_spec.ts              | 2 +-
 modules/benchmarks/src/largetable/ng2/index.ts             | 2 +-
 modules/benchmarks/src/largetable/ng2_switch/index.ts      | 2 +-
 modules/benchmarks/src/tree/baseline/index.ts              | 2 +-
 modules/benchmarks/src/tree/incremental_dom/index.ts       | 2 +-
 modules/benchmarks/src/tree/ng2/index.ts                   | 4 ++--
 modules/benchmarks/src/tree/ng2_static/index.ts            | 4 ++--
 modules/benchmarks/src/tree/ng2_switch/index.ts            | 4 ++--
 modules/benchmarks/src/tree/ng2_switch/tree.ts             | 2 +-
 modules/benchmarks/src/tree/polymer_leaves/index.ts        | 2 +-
 modules/playground/e2e_test/sourcemap/sourcemap_spec.ts    | 2 +-
 modules/playground/src/animate/app/animate-app.ts          | 2 +-
 modules/playground/src/animate/index.ts                    | 2 +-
 modules/playground/src/model_driven_forms/index.ts         | 2 +-
 modules/playground/src/routing/app/inbox-app.ts            | 2 +-
 modules/playground/src/template_driven_forms/index.ts      | 4 ++--
 modules/playground/src/web_workers/images/index_common.ts  | 1 -
 modules/playground/src/web_workers/images/single_thread.ts | 2 +-
 219 files changed, 241 insertions(+), 295 deletions(-)

diff --git a/modules/@angular/benchpress/src/reporter/console_reporter.ts b/modules/@angular/benchpress/src/reporter/console_reporter.ts
index 8a4a5198afdf..96187a311f80 100644
--- a/modules/@angular/benchpress/src/reporter/console_reporter.ts
+++ b/modules/@angular/benchpress/src/reporter/console_reporter.ts
@@ -7,10 +7,7 @@
  */
 
 import {Inject, Injectable, OpaqueToken} from '@angular/core';
-
-import {ListWrapper, StringMapWrapper} from '../facade/collection';
-import {NumberWrapper, isBlank, isPresent, print} from '../facade/lang';
-import {Math} from '../facade/math';
+import {print} from '../facade/lang';
 import {MeasureValues} from '../measure_values';
 import {Reporter} from '../reporter';
 import {SampleDescription} from '../sample_description';
diff --git a/modules/@angular/benchpress/src/reporter/json_file_reporter.ts b/modules/@angular/benchpress/src/reporter/json_file_reporter.ts
index 814aac37bc17..db64677881d3 100644
--- a/modules/@angular/benchpress/src/reporter/json_file_reporter.ts
+++ b/modules/@angular/benchpress/src/reporter/json_file_reporter.ts
@@ -9,7 +9,7 @@
 import {Inject, Injectable, OpaqueToken} from '@angular/core';
 
 import {Options} from '../common_options';
-import {DateWrapper, Json, isBlank, isPresent} from '../facade/lang';
+import {DateWrapper, Json} from '../facade/lang';
 import {MeasureValues} from '../measure_values';
 import {Reporter} from '../reporter';
 import {SampleDescription} from '../sample_description';
diff --git a/modules/@angular/benchpress/src/runner.ts b/modules/@angular/benchpress/src/runner.ts
index 5ad1674c9942..f684cb12a5ed 100644
--- a/modules/@angular/benchpress/src/runner.ts
+++ b/modules/@angular/benchpress/src/runner.ts
@@ -9,7 +9,7 @@
 import {Provider, ReflectiveInjector} from '@angular/core';
 
 import {Options} from './common_options';
-import {isBlank, isPresent} from './facade/lang';
+import {isPresent} from './facade/lang';
 import {Metric} from './metric';
 import {MultiMetric} from './metric/multi_metric';
 import {PerflogMetric} from './metric/perflog_metric';
diff --git a/modules/@angular/benchpress/src/web_driver_extension.ts b/modules/@angular/benchpress/src/web_driver_extension.ts
index afd680f37223..06030e17a45c 100644
--- a/modules/@angular/benchpress/src/web_driver_extension.ts
+++ b/modules/@angular/benchpress/src/web_driver_extension.ts
@@ -9,7 +9,7 @@
 import {Injector, OpaqueToken} from '@angular/core';
 
 import {Options} from './common_options';
-import {isBlank, isPresent} from './facade/lang';
+import {isBlank} from './facade/lang';
 
 export type PerfLogEvent = {
   [key: string]: any
diff --git a/modules/@angular/benchpress/test/metric/multi_metric_spec.ts b/modules/@angular/benchpress/test/metric/multi_metric_spec.ts
index 95c05220d76f..445a31836994 100644
--- a/modules/@angular/benchpress/test/metric/multi_metric_spec.ts
+++ b/modules/@angular/benchpress/test/metric/multi_metric_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
 import {Metric, MultiMetric, ReflectiveInjector} from '../../index';
 
 export function main() {
diff --git a/modules/@angular/benchpress/test/metric/perflog_metric_spec.ts b/modules/@angular/benchpress/test/metric/perflog_metric_spec.ts
index 43f1a5ea447f..84f113e3a1ed 100644
--- a/modules/@angular/benchpress/test/metric/perflog_metric_spec.ts
+++ b/modules/@angular/benchpress/test/metric/perflog_metric_spec.ts
@@ -7,7 +7,7 @@
  */
 
 import {Provider} from '@angular/core';
-import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {AsyncTestCompleter, beforeEach, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
 
 import {Metric, Options, PerfLogEvent, PerfLogFeatures, PerflogMetric, ReflectiveInjector, WebDriverExtension} from '../../index';
 import {StringMapWrapper} from '../../src/facade/collection';
diff --git a/modules/@angular/benchpress/test/metric/user_metric_spec.ts b/modules/@angular/benchpress/test/metric/user_metric_spec.ts
index 9f034c56a56c..5680e216d8a9 100644
--- a/modules/@angular/benchpress/test/metric/user_metric_spec.ts
+++ b/modules/@angular/benchpress/test/metric/user_metric_spec.ts
@@ -7,11 +7,10 @@
  */
 
 import {Provider, ReflectiveInjector} from '@angular/core';
-import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
 
-import {Injector, Metric, MultiMetric, Options, PerfLogEvent, PerfLogFeatures, PerflogMetric, UserMetric, WebDriverAdapter, WebDriverExtension} from '../../index';
-import {StringMapWrapper} from '../../src/facade/collection';
-import {Json, isBlank, isPresent} from '../../src/facade/lang';
+import {Options, PerfLogEvent, PerfLogFeatures, UserMetric, WebDriverAdapter} from '../../index';
+import {isBlank} from '../../src/facade/lang';
 
 export function main() {
   var wdAdapter: MockDriverAdapter;
diff --git a/modules/@angular/benchpress/test/reporter/console_reporter_spec.ts b/modules/@angular/benchpress/test/reporter/console_reporter_spec.ts
index 12ee9b7df9dd..5fc5ae3798d6 100644
--- a/modules/@angular/benchpress/test/reporter/console_reporter_spec.ts
+++ b/modules/@angular/benchpress/test/reporter/console_reporter_spec.ts
@@ -7,7 +7,7 @@
  */
 
 import {Provider} from '@angular/core';
-import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {describe, expect, it} from '@angular/core/testing/testing_internal';
 
 import {ConsoleReporter, MeasureValues, ReflectiveInjector, SampleDescription} from '../../index';
 import {DateWrapper, isBlank, isPresent} from '../../src/facade/lang';
diff --git a/modules/@angular/benchpress/test/reporter/json_file_reporter_spec.ts b/modules/@angular/benchpress/test/reporter/json_file_reporter_spec.ts
index ba3f181d7534..f5ce8027d9df 100644
--- a/modules/@angular/benchpress/test/reporter/json_file_reporter_spec.ts
+++ b/modules/@angular/benchpress/test/reporter/json_file_reporter_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
 
 import {JsonFileReporter, MeasureValues, Options, ReflectiveInjector, SampleDescription} from '../../index';
 import {DateWrapper, Json, isPresent} from '../../src/facade/lang';
diff --git a/modules/@angular/benchpress/test/reporter/multi_reporter_spec.ts b/modules/@angular/benchpress/test/reporter/multi_reporter_spec.ts
index 9d4c1b9ac12d..89b0c371f460 100644
--- a/modules/@angular/benchpress/test/reporter/multi_reporter_spec.ts
+++ b/modules/@angular/benchpress/test/reporter/multi_reporter_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
 
 import {MeasureValues, MultiReporter, ReflectiveInjector, Reporter} from '../../index';
 import {DateWrapper} from '../../src/facade/lang';
diff --git a/modules/@angular/benchpress/test/runner_spec.ts b/modules/@angular/benchpress/test/runner_spec.ts
index f63a8a569402..6121ac6bcd5d 100644
--- a/modules/@angular/benchpress/test/runner_spec.ts
+++ b/modules/@angular/benchpress/test/runner_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
 
 import {Injector, Metric, Options, ReflectiveInjector, Runner, SampleDescription, SampleState, Sampler, Validator, WebDriverAdapter} from '../index';
 import {isBlank} from '../src/facade/lang';
diff --git a/modules/@angular/benchpress/test/sampler_spec.ts b/modules/@angular/benchpress/test/sampler_spec.ts
index c9653aed3f05..4d91120e7ce9 100644
--- a/modules/@angular/benchpress/test/sampler_spec.ts
+++ b/modules/@angular/benchpress/test/sampler_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
 
 import {MeasureValues, Metric, Options, ReflectiveInjector, Reporter, Sampler, Validator, WebDriverAdapter} from '../index';
 import {DateWrapper, isBlank, isPresent} from '../src/facade/lang';
diff --git a/modules/@angular/benchpress/test/statistic_spec.ts b/modules/@angular/benchpress/test/statistic_spec.ts
index 075023d5033f..23124061a099 100644
--- a/modules/@angular/benchpress/test/statistic_spec.ts
+++ b/modules/@angular/benchpress/test/statistic_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {describe, expect, it} from '@angular/core/testing/testing_internal';
 import {Statistic} from '../src/statistic';
 
 export function main() {
diff --git a/modules/@angular/benchpress/test/validator/regression_slope_validator_spec.ts b/modules/@angular/benchpress/test/validator/regression_slope_validator_spec.ts
index 76305fb467c2..66e2a262dbc0 100644
--- a/modules/@angular/benchpress/test/validator/regression_slope_validator_spec.ts
+++ b/modules/@angular/benchpress/test/validator/regression_slope_validator_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {describe, expect, it} from '@angular/core/testing/testing_internal';
 
 import {MeasureValues, ReflectiveInjector, RegressionSlopeValidator} from '../../index';
 import {ListWrapper} from '../../src/facade/collection';
diff --git a/modules/@angular/benchpress/test/validator/size_validator_spec.ts b/modules/@angular/benchpress/test/validator/size_validator_spec.ts
index bc8c35dc8e8a..b75358798b64 100644
--- a/modules/@angular/benchpress/test/validator/size_validator_spec.ts
+++ b/modules/@angular/benchpress/test/validator/size_validator_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {describe, expect, it} from '@angular/core/testing/testing_internal';
 
 import {MeasureValues, ReflectiveInjector, SizeValidator} from '../../index';
 import {ListWrapper} from '../../src/facade/collection';
diff --git a/modules/@angular/benchpress/test/web_driver_extension_spec.ts b/modules/@angular/benchpress/test/web_driver_extension_spec.ts
index 5eaa2865d5b5..ed70dc5fda0f 100644
--- a/modules/@angular/benchpress/test/web_driver_extension_spec.ts
+++ b/modules/@angular/benchpress/test/web_driver_extension_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
 
 import {Options, ReflectiveInjector, WebDriverExtension} from '../index';
 import {StringWrapper, isPresent} from '../src/facade/lang';
diff --git a/modules/@angular/benchpress/test/webdriver/chrome_driver_extension_spec.ts b/modules/@angular/benchpress/test/webdriver/chrome_driver_extension_spec.ts
index ac7f054b8615..3f28baa57c57 100644
--- a/modules/@angular/benchpress/test/webdriver/chrome_driver_extension_spec.ts
+++ b/modules/@angular/benchpress/test/webdriver/chrome_driver_extension_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
 
 import {ChromeDriverExtension, Options, ReflectiveInjector, WebDriverAdapter, WebDriverExtension} from '../../index';
 import {Json, isBlank} from '../../src/facade/lang';
diff --git a/modules/@angular/benchpress/test/webdriver/ios_driver_extension_spec.ts b/modules/@angular/benchpress/test/webdriver/ios_driver_extension_spec.ts
index b749e939a59a..242fef407306 100644
--- a/modules/@angular/benchpress/test/webdriver/ios_driver_extension_spec.ts
+++ b/modules/@angular/benchpress/test/webdriver/ios_driver_extension_spec.ts
@@ -6,10 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
 
 import {IOsDriverExtension, ReflectiveInjector, WebDriverAdapter, WebDriverExtension} from '../../index';
-import {Json, isBlank, isPresent} from '../../src/facade/lang';
+import {Json, isBlank} from '../../src/facade/lang';
 import {TraceEventFactory} from '../trace_event_factory';
 
 export function main() {
diff --git a/modules/@angular/common/test/directives/ng_class_spec.ts b/modules/@angular/common/test/directives/ng_class_spec.ts
index 5c962840c0a6..15369390554a 100644
--- a/modules/@angular/common/test/directives/ng_class_spec.ts
+++ b/modules/@angular/common/test/directives/ng_class_spec.ts
@@ -8,7 +8,7 @@
 
 import {Component} from '@angular/core';
 import {ComponentFixture, TestBed, async} from '@angular/core/testing';
-import {beforeEach, ddescribe, describe, expect, iit, inject, it, xdescribe, xit} from '@angular/core/testing/testing_internal';
+import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal';
 
 export function main() {
   describe('binding to CSS class list', () => {
diff --git a/modules/@angular/common/test/localization_spec.ts b/modules/@angular/common/test/localization_spec.ts
index afec2c0dcbba..28d82716fd31 100644
--- a/modules/@angular/common/test/localization_spec.ts
+++ b/modules/@angular/common/test/localization_spec.ts
@@ -8,7 +8,7 @@
 
 import {LOCALE_ID} from '@angular/core';
 import {TestBed} from '@angular/core/testing';
-import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {beforeEach, describe, inject, it} from '@angular/core/testing/testing_internal';
 import {expect} from '@angular/platform-browser/testing/matchers';
 
 import {NgLocaleLocalization, NgLocalization, getPluralCategory} from '../src/localization';
diff --git a/modules/@angular/common/test/pipes/async_pipe_spec.ts b/modules/@angular/common/test/pipes/async_pipe_spec.ts
index a0240a89e1b1..d125c41613d7 100644
--- a/modules/@angular/common/test/pipes/async_pipe_spec.ts
+++ b/modules/@angular/common/test/pipes/async_pipe_spec.ts
@@ -8,7 +8,7 @@
 
 import {AsyncPipe} from '@angular/common';
 import {WrappedValue} from '@angular/core';
-import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {AsyncTestCompleter, beforeEach, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
 import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
 import {browserDetection} from '@angular/platform-browser/testing/browser_util';
 
diff --git a/modules/@angular/common/test/pipes/date_pipe_spec.ts b/modules/@angular/common/test/pipes/date_pipe_spec.ts
index 25e58c8bebb9..32c88cf203a3 100644
--- a/modules/@angular/common/test/pipes/date_pipe_spec.ts
+++ b/modules/@angular/common/test/pipes/date_pipe_spec.ts
@@ -8,7 +8,7 @@
 
 import {DatePipe} from '@angular/common';
 import {PipeResolver} from '@angular/compiler/src/pipe_resolver';
-import {afterEach, beforeEach, ddescribe, describe, expect, iit, it, xit} from '@angular/core/testing/testing_internal';
+import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal';
 import {browserDetection} from '@angular/platform-browser/testing/browser_util';
 
 import {DateWrapper} from '../../src/facade/lang';
diff --git a/modules/@angular/common/test/pipes/i18n_plural_pipe_spec.ts b/modules/@angular/common/test/pipes/i18n_plural_pipe_spec.ts
index 5f0198bc132a..f042f777bfcd 100644
--- a/modules/@angular/common/test/pipes/i18n_plural_pipe_spec.ts
+++ b/modules/@angular/common/test/pipes/i18n_plural_pipe_spec.ts
@@ -8,7 +8,7 @@
 
 import {I18nPluralPipe, NgLocalization} from '@angular/common';
 import {PipeResolver} from '@angular/compiler/src/pipe_resolver';
-import {afterEach, beforeEach, ddescribe, describe, expect, iit, it, xit} from '@angular/core/testing/testing_internal';
+import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal';
 
 export function main() {
   describe('I18nPluralPipe', () => {
diff --git a/modules/@angular/common/test/pipes/i18n_select_pipe_spec.ts b/modules/@angular/common/test/pipes/i18n_select_pipe_spec.ts
index bd4874dedaf9..2cecbf1bfd56 100644
--- a/modules/@angular/common/test/pipes/i18n_select_pipe_spec.ts
+++ b/modules/@angular/common/test/pipes/i18n_select_pipe_spec.ts
@@ -8,7 +8,7 @@
 
 import {I18nSelectPipe} from '@angular/common';
 import {PipeResolver} from '@angular/compiler/src/pipe_resolver';
-import {afterEach, beforeEach, ddescribe, describe, expect, iit, it, xit} from '@angular/core/testing/testing_internal';
+import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal';
 
 export function main() {
   describe('I18nSelectPipe', () => {
diff --git a/modules/@angular/common/test/pipes/lowercase_pipe_spec.ts b/modules/@angular/common/test/pipes/lowercase_pipe_spec.ts
index 31d699007c5f..c508525e3f01 100644
--- a/modules/@angular/common/test/pipes/lowercase_pipe_spec.ts
+++ b/modules/@angular/common/test/pipes/lowercase_pipe_spec.ts
@@ -7,7 +7,7 @@
  */
 
 import {LowerCasePipe} from '@angular/common';
-import {afterEach, beforeEach, ddescribe, describe, expect, iit, it, xit} from '@angular/core/testing/testing_internal';
+import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal';
 
 export function main() {
   describe('LowerCasePipe', () => {
diff --git a/modules/@angular/common/test/pipes/number_pipe_spec.ts b/modules/@angular/common/test/pipes/number_pipe_spec.ts
index e19a9e8786f1..29c8e80206ca 100644
--- a/modules/@angular/common/test/pipes/number_pipe_spec.ts
+++ b/modules/@angular/common/test/pipes/number_pipe_spec.ts
@@ -7,7 +7,7 @@
  */
 
 import {CurrencyPipe, DecimalPipe, PercentPipe} from '@angular/common';
-import {afterEach, beforeEach, ddescribe, describe, expect, iit, it, xit} from '@angular/core/testing/testing_internal';
+import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal';
 import {browserDetection} from '@angular/platform-browser/testing/browser_util';
 
 export function main() {
diff --git a/modules/@angular/common/test/pipes/slice_pipe_spec.ts b/modules/@angular/common/test/pipes/slice_pipe_spec.ts
index 683f9bb5a603..c3cbdea10eb3 100644
--- a/modules/@angular/common/test/pipes/slice_pipe_spec.ts
+++ b/modules/@angular/common/test/pipes/slice_pipe_spec.ts
@@ -9,7 +9,6 @@
 import {CommonModule, SlicePipe} from '@angular/common';
 import {Component} from '@angular/core';
 import {TestBed, async} from '@angular/core/testing';
-import {browserDetection} from '@angular/platform-browser/testing/browser_util';
 import {expect} from '@angular/platform-browser/testing/matchers';
 
 export function main() {
diff --git a/modules/@angular/common/test/pipes/uppercase_pipe_spec.ts b/modules/@angular/common/test/pipes/uppercase_pipe_spec.ts
index e8bb9a469446..c4e391c78d76 100644
--- a/modules/@angular/common/test/pipes/uppercase_pipe_spec.ts
+++ b/modules/@angular/common/test/pipes/uppercase_pipe_spec.ts
@@ -7,7 +7,7 @@
  */
 
 import {UpperCasePipe} from '@angular/common';
-import {afterEach, beforeEach, ddescribe, describe, expect, iit, it, xit} from '@angular/core/testing/testing_internal';
+import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal';
 
 export function main() {
   describe('UpperCasePipe', () => {
diff --git a/modules/@angular/common/test/spies.ts b/modules/@angular/common/test/spies.ts
index 6c4d6bb722d3..6338e5252c98 100644
--- a/modules/@angular/common/test/spies.ts
+++ b/modules/@angular/common/test/spies.ts
@@ -7,7 +7,7 @@
  */
 
 import {ChangeDetectorRef} from '@angular/core/src/change_detection/change_detector_ref';
-import {SpyObject, proxy} from '@angular/core/testing/testing_internal';
+import {SpyObject} from '@angular/core/testing/testing_internal';
 
 export class SpyChangeDetectorRef extends SpyObject {
   constructor() {
diff --git a/modules/@angular/compiler-cli/src/static_reflector.ts b/modules/@angular/compiler-cli/src/static_reflector.ts
index 4bd14ddd4013..eac7121917af 100644
--- a/modules/@angular/compiler-cli/src/static_reflector.ts
+++ b/modules/@angular/compiler-cli/src/static_reflector.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Attribute, Component, ContentChild, ContentChildren, Directive, Host, HostBinding, HostListener, Inject, Injectable, Input, NgModule, Optional, Output, Pipe, Query, Self, SkipSelf, ViewChild, ViewChildren, animate, group, keyframes, sequence, state, style, transition, trigger} from '@angular/core';
+import {Attribute, Component, ContentChild, ContentChildren, Directive, Host, HostBinding, HostListener, Inject, Injectable, Input, NgModule, Optional, Output, Pipe, Self, SkipSelf, ViewChild, ViewChildren, animate, group, keyframes, sequence, state, style, transition, trigger} from '@angular/core';
 
 import {ReflectorReader} from './private_import_core';
 
diff --git a/modules/@angular/compiler/src/compile_metadata.ts b/modules/@angular/compiler/src/compile_metadata.ts
index e7eddf4f4adf..94db25d41840 100644
--- a/modules/@angular/compiler/src/compile_metadata.ts
+++ b/modules/@angular/compiler/src/compile_metadata.ts
@@ -9,10 +9,9 @@
 import {ChangeDetectionStrategy, SchemaMetadata, Type, ViewEncapsulation} from '@angular/core';
 
 import {ListWrapper, MapWrapper, StringMapWrapper} from './facade/collection';
-import {isBlank, isPresent, isStringMap, normalizeBlank, normalizeBool} from './facade/lang';
-import {LifecycleHooks, reflector} from './private_import_core';
+import {isPresent, isStringMap, normalizeBlank, normalizeBool} from './facade/lang';
+import {LifecycleHooks} from './private_import_core';
 import {CssSelector} from './selector';
-import {getUrlScheme} from './url_resolver';
 import {sanitizeIdentifier, splitAtColon} from './util';
 
 function unimplemented(): any {
diff --git a/modules/@angular/compiler/src/compiler.ts b/modules/@angular/compiler/src/compiler.ts
index f23e7f20f6aa..b0f2633695c2 100644
--- a/modules/@angular/compiler/src/compiler.ts
+++ b/modules/@angular/compiler/src/compiler.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {COMPILER_OPTIONS, ClassProvider, Compiler, CompilerFactory, CompilerOptions, Component, ExistingProvider, FactoryProvider, Inject, Injectable, Optional, PLATFORM_INITIALIZER, PlatformRef, Provider, ReflectiveInjector, TRANSLATIONS, TRANSLATIONS_FORMAT, Type, TypeProvider, ValueProvider, ViewEncapsulation, createPlatformFactory, isDevMode, platformCore} from '@angular/core';
+import {COMPILER_OPTIONS, Compiler, CompilerFactory, CompilerOptions, Inject, Injectable, Optional, PLATFORM_INITIALIZER, PlatformRef, Provider, ReflectiveInjector, TRANSLATIONS, TRANSLATIONS_FORMAT, Type, ViewEncapsulation, createPlatformFactory, isDevMode, platformCore} from '@angular/core';
 
 export * from './template_parser/template_ast';
 export {TEMPLATE_TRANSFORMS} from './template_parser/template_parser';
diff --git a/modules/@angular/compiler/src/expression_parser/ast.ts b/modules/@angular/compiler/src/expression_parser/ast.ts
index 8c65ead52fbf..340c47981ea2 100644
--- a/modules/@angular/compiler/src/expression_parser/ast.ts
+++ b/modules/@angular/compiler/src/expression_parser/ast.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ListWrapper} from '../facade/collection';
+
 import {isBlank} from '../facade/lang';
 
 export class ParserError {
diff --git a/modules/@angular/compiler/src/ng_module_compiler.ts b/modules/@angular/compiler/src/ng_module_compiler.ts
index 4c0871818f3a..42e4910d9282 100644
--- a/modules/@angular/compiler/src/ng_module_compiler.ts
+++ b/modules/@angular/compiler/src/ng_module_compiler.ts
@@ -10,7 +10,7 @@ import {Injectable} from '@angular/core';
 
 import {CompileDiDependencyMetadata, CompileIdentifierMetadata, CompileNgModuleMetadata, CompileProviderMetadata, CompileTokenMetadata} from './compile_metadata';
 import {isBlank, isPresent} from './facade/lang';
-import {Identifiers, identifierToken, resolveIdentifier, resolveIdentifierToken} from './identifiers';
+import {Identifiers, resolveIdentifier, resolveIdentifierToken} from './identifiers';
 import * as o from './output/output_ast';
 import {convertValueToOutputAst} from './output/value_util';
 import {ParseLocation, ParseSourceFile, ParseSourceSpan} from './parse_util';
diff --git a/modules/@angular/compiler/src/offline_compiler.ts b/modules/@angular/compiler/src/offline_compiler.ts
index 65a9bb285687..e7cdaeb34f26 100644
--- a/modules/@angular/compiler/src/offline_compiler.ts
+++ b/modules/@angular/compiler/src/offline_compiler.ts
@@ -10,7 +10,7 @@ import {SchemaMetadata} from '@angular/core';
 
 import {AnimationCompiler} from './animation/animation_compiler';
 import {AnimationParser} from './animation/animation_parser';
-import {CompileDirectiveMetadata, CompileIdentifierMetadata, CompileNgModuleMetadata, CompilePipeMetadata, CompileProviderMetadata, CompileTokenMetadata, StaticSymbol, createHostComponentMeta} from './compile_metadata';
+import {CompileDirectiveMetadata, CompileIdentifierMetadata, CompileNgModuleMetadata, CompilePipeMetadata, CompileProviderMetadata, StaticSymbol, createHostComponentMeta} from './compile_metadata';
 import {DirectiveNormalizer} from './directive_normalizer';
 import {Identifiers, resolveIdentifier, resolveIdentifierToken} from './identifiers';
 import {CompileMetadataResolver} from './metadata_resolver';
diff --git a/modules/@angular/compiler/src/output/js_emitter.ts b/modules/@angular/compiler/src/output/js_emitter.ts
index c59e5584172d..2a34751137c0 100644
--- a/modules/@angular/compiler/src/output/js_emitter.ts
+++ b/modules/@angular/compiler/src/output/js_emitter.ts
@@ -7,7 +7,7 @@
  */
 
 
-import {StringWrapper, evalExpression, isBlank, isPresent, isString} from '../facade/lang';
+import {isBlank, isPresent} from '../facade/lang';
 
 import {EmitterVisitorContext, OutputEmitter} from './abstract_emitter';
 import {AbstractJsEmitterVisitor} from './abstract_js_emitter';
diff --git a/modules/@angular/compiler/src/output/output_ast.ts b/modules/@angular/compiler/src/output/output_ast.ts
index f148d402b3d4..f81c5278d752 100644
--- a/modules/@angular/compiler/src/output/output_ast.ts
+++ b/modules/@angular/compiler/src/output/output_ast.ts
@@ -8,9 +8,7 @@
 
 
 import {CompileIdentifierMetadata} from '../compile_metadata';
-import {StringMapWrapper} from '../facade/collection';
 import {isBlank, isPresent, isString} from '../facade/lang';
-import {ValueTransformer, visitValue} from '../util';
 
 
 
diff --git a/modules/@angular/compiler/src/provider_analyzer.ts b/modules/@angular/compiler/src/provider_analyzer.ts
index b6160788da70..91575e1329d9 100644
--- a/modules/@angular/compiler/src/provider_analyzer.ts
+++ b/modules/@angular/compiler/src/provider_analyzer.ts
@@ -12,7 +12,7 @@ import {ListWrapper, MapWrapper} from './facade/collection';
 import {isArray, isBlank, isPresent, normalizeBlank} from './facade/lang';
 import {Identifiers, resolveIdentifierToken} from './identifiers';
 import {ParseError, ParseSourceSpan} from './parse_util';
-import {AttrAst, DirectiveAst, ProviderAst, ProviderAstType, ReferenceAst, VariableAst} from './template_parser/template_ast';
+import {AttrAst, DirectiveAst, ProviderAst, ProviderAstType, ReferenceAst} from './template_parser/template_ast';
 
 export class ProviderError extends ParseError {
   constructor(message: string, span: ParseSourceSpan) { super(span, message); }
diff --git a/modules/@angular/compiler/src/runtime_compiler.ts b/modules/@angular/compiler/src/runtime_compiler.ts
index 1ca88871c337..80c96eaf299a 100644
--- a/modules/@angular/compiler/src/runtime_compiler.ts
+++ b/modules/@angular/compiler/src/runtime_compiler.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Compiler, ComponentFactory, Injectable, Injector, ModuleWithComponentFactories, NgModuleFactory, Optional, Provider, SchemaMetadata, SkipSelf, Type} from '@angular/core';
+import {Compiler, ComponentFactory, Injectable, Injector, ModuleWithComponentFactories, NgModuleFactory, SchemaMetadata, Type} from '@angular/core';
 import {AnimationCompiler} from './animation/animation_compiler';
 import {AnimationParser} from './animation/animation_parser';
 import {CompileDirectiveMetadata, CompileIdentifierMetadata, CompileNgModuleMetadata, CompilePipeMetadata, ProviderMeta, createHostComponentMeta} from './compile_metadata';
diff --git a/modules/@angular/compiler/src/view_compiler/compile_pipe.ts b/modules/@angular/compiler/src/view_compiler/compile_pipe.ts
index 56ba18b9398d..ec02559bb77d 100644
--- a/modules/@angular/compiler/src/view_compiler/compile_pipe.ts
+++ b/modules/@angular/compiler/src/view_compiler/compile_pipe.ts
@@ -8,8 +8,8 @@
 
 
 import {CompilePipeMetadata} from '../compile_metadata';
-import {isBlank, isPresent} from '../facade/lang';
-import {Identifiers, identifierToken, resolveIdentifier, resolveIdentifierToken} from '../identifiers';
+import {isBlank} from '../facade/lang';
+import {Identifiers, resolveIdentifier, resolveIdentifierToken} from '../identifiers';
 import * as o from '../output/output_ast';
 
 import {CompileView} from './compile_view';
diff --git a/modules/@angular/compiler/src/view_compiler/compile_query.ts b/modules/@angular/compiler/src/view_compiler/compile_query.ts
index 1069455bfa1d..0fba9175b384 100644
--- a/modules/@angular/compiler/src/view_compiler/compile_query.ts
+++ b/modules/@angular/compiler/src/view_compiler/compile_query.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {CompileQueryMetadata, CompileTokenMetadata} from '../compile_metadata';
+import {CompileQueryMetadata} from '../compile_metadata';
 import {ListWrapper} from '../facade/collection';
 import {isBlank, isPresent} from '../facade/lang';
 import {Identifiers, resolveIdentifier} from '../identifiers';
diff --git a/modules/@angular/compiler/src/view_compiler/compile_view.ts b/modules/@angular/compiler/src/view_compiler/compile_view.ts
index 7d429211cc18..5b5b4b1bf258 100644
--- a/modules/@angular/compiler/src/view_compiler/compile_view.ts
+++ b/modules/@angular/compiler/src/view_compiler/compile_view.ts
@@ -7,14 +7,13 @@
  */
 
 import {AnimationEntryCompileResult} from '../animation/animation_compiler';
-import {CompileDirectiveMetadata, CompileIdentifierMetadata, CompilePipeMetadata, CompileTokenMetadata} from '../compile_metadata';
+import {CompileDirectiveMetadata, CompileIdentifierMetadata, CompilePipeMetadata} from '../compile_metadata';
 import {CompilerConfig} from '../config';
 import {ListWrapper, MapWrapper} from '../facade/collection';
 import {isBlank, isPresent} from '../facade/lang';
 import {Identifiers, resolveIdentifier} from '../identifiers';
 import * as o from '../output/output_ast';
 import {ViewType} from '../private_import_core';
-import {createDiTokenExpression} from '../util';
 
 import {CompileBinding} from './compile_binding';
 import {CompileElement, CompileNode} from './compile_element';
@@ -23,7 +22,7 @@ import {CompilePipe} from './compile_pipe';
 import {CompileQuery, addQueryToTokenMap, createQueryList} from './compile_query';
 import {EventHandlerVars} from './constants';
 import {NameResolver} from './expression_converter';
-import {createPureProxy, getPropertyInView, getViewFactoryName, injectFromViewParentInjector} from './util';
+import {createPureProxy, getPropertyInView, getViewFactoryName} from './util';
 
 export class CompileView implements NameResolver {
   public viewType: ViewType;
diff --git a/modules/@angular/compiler/src/view_compiler/constants.ts b/modules/@angular/compiler/src/view_compiler/constants.ts
index b6dc075f147f..f97a4ff565e4 100644
--- a/modules/@angular/compiler/src/view_compiler/constants.ts
+++ b/modules/@angular/compiler/src/view_compiler/constants.ts
@@ -9,7 +9,6 @@
 import {ChangeDetectionStrategy, ViewEncapsulation} from '@angular/core';
 
 import {CompileIdentifierMetadata} from '../compile_metadata';
-import {isBlank} from '../facade/lang';
 import {Identifiers, resolveEnumIdentifier, resolveIdentifier} from '../identifiers';
 import * as o from '../output/output_ast';
 
diff --git a/modules/@angular/compiler/src/view_compiler/event_binder.ts b/modules/@angular/compiler/src/view_compiler/event_binder.ts
index 72a8a3de2b89..b491c4daa8bf 100644
--- a/modules/@angular/compiler/src/view_compiler/event_binder.ts
+++ b/modules/@angular/compiler/src/view_compiler/event_binder.ts
@@ -7,9 +7,9 @@
  */
 
 import {CompileDirectiveMetadata} from '../compile_metadata';
-import {ListWrapper, StringMapWrapper} from '../facade/collection';
+import {StringMapWrapper} from '../facade/collection';
 import {StringWrapper, isBlank, isPresent} from '../facade/lang';
-import {Identifiers, identifierToken, resolveIdentifier} from '../identifiers';
+import {identifierToken} from '../identifiers';
 import * as o from '../output/output_ast';
 import {BoundEventAst, DirectiveAst} from '../template_parser/template_ast';
 
diff --git a/modules/@angular/compiler/src/view_compiler/view_binder.ts b/modules/@angular/compiler/src/view_compiler/view_binder.ts
index 2f98f0f151e8..5c81bbef54f1 100644
--- a/modules/@angular/compiler/src/view_compiler/view_binder.ts
+++ b/modules/@angular/compiler/src/view_compiler/view_binder.ts
@@ -5,11 +5,10 @@
  * 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 {ListWrapper} from '../facade/collection';
-import {identifierToken} from '../identifiers';
+
 import {AttrAst, BoundDirectivePropertyAst, BoundElementPropertyAst, BoundEventAst, BoundTextAst, DirectiveAst, ElementAst, EmbeddedTemplateAst, NgContentAst, ReferenceAst, TemplateAst, TemplateAstVisitor, TextAst, VariableAst, templateVisitAll} from '../template_parser/template_ast';
 
-import {CompileElement, CompileNode} from './compile_element';
+import {CompileElement} from './compile_element';
 import {CompileView} from './compile_view';
 import {CompileEventListener, bindDirectiveOutputs, bindRenderOutputs, collectEventListeners} from './event_binder';
 import {bindDirectiveAfterContentLifecycleCallbacks, bindDirectiveAfterViewLifecycleCallbacks, bindDirectiveDetectChangesLifecycleCallbacks, bindInjectableDestroyLifecycleCallbacks, bindPipeDestroyLifecycleCallbacks} from './lifecycle_binder';
diff --git a/modules/@angular/compiler/test/animation/animation_compiler_spec.ts b/modules/@angular/compiler/test/animation/animation_compiler_spec.ts
index bdb6b4f22188..ca758524fb40 100644
--- a/modules/@angular/compiler/test/animation/animation_compiler_spec.ts
+++ b/modules/@angular/compiler/test/animation/animation_compiler_spec.ts
@@ -6,10 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AnimationMetadata, animate, group, sequence, style, transition, trigger} from '@angular/core';
-import {AsyncTestCompleter, beforeEach, beforeEachProviders, ddescribe, describe, expect, iit, inject, it, xdescribe, xit} from '@angular/core/testing/testing_internal';
-
-import {StringMapWrapper} from '../../../platform-browser-dynamic/src/facade/collection';
+import {AnimationMetadata, animate, sequence, style, transition, trigger} from '@angular/core';
+import {beforeEach, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
 import {AnimationCompiler, AnimationEntryCompileResult} from '../../src/animation/animation_compiler';
 import {AnimationParser} from '../../src/animation/animation_parser';
 import {CompileAnimationEntryMetadata, CompileDirectiveMetadata, CompileTemplateMetadata, CompileTypeMetadata} from '../../src/compile_metadata';
diff --git a/modules/@angular/compiler/test/animation/animation_parser_spec.ts b/modules/@angular/compiler/test/animation/animation_parser_spec.ts
index 1e0fd724554f..9958eaa0100c 100644
--- a/modules/@angular/compiler/test/animation/animation_parser_spec.ts
+++ b/modules/@angular/compiler/test/animation/animation_parser_spec.ts
@@ -6,13 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AnimationAnimateMetadata, AnimationGroupMetadata, AnimationMetadata, AnimationSequenceMetadata, AnimationStyleMetadata, AnimationWithStepsMetadata, animate, group, keyframes, sequence, state, style, transition, trigger} from '@angular/core';
-import {AsyncTestCompleter, beforeEach, beforeEachProviders, ddescribe, describe, iit, inject, it, xdescribe, xit} from '@angular/core/testing/testing_internal';
+import {AnimationMetadata, animate, group, keyframes, sequence, style, transition, trigger} from '@angular/core';
+import {beforeEach, describe, inject, it} from '@angular/core/testing/testing_internal';
 import {expect} from '@angular/platform-browser/testing/matchers';
 
-import {AnimationAst, AnimationEntryAst, AnimationGroupAst, AnimationKeyframeAst, AnimationSequenceAst, AnimationStateTransitionAst, AnimationStepAst, AnimationStylesAst} from '../../src/animation/animation_ast';
+import {AnimationEntryAst, AnimationGroupAst, AnimationKeyframeAst, AnimationSequenceAst, AnimationStepAst, AnimationStylesAst} from '../../src/animation/animation_ast';
 import {AnimationParser} from '../../src/animation/animation_parser';
-import {CompileDirectiveMetadata, CompileTemplateMetadata, CompileTypeMetadata} from '../../src/compile_metadata';
 import {StringMapWrapper} from '../../src/facade/collection';
 import {CompileMetadataResolver} from '../../src/metadata_resolver';
 import {FILL_STYLE_FLAG, flattenStyles} from '../private_import_core';
diff --git a/modules/@angular/compiler/test/css_parser/css_lexer_spec.ts b/modules/@angular/compiler/test/css_parser/css_lexer_spec.ts
index 04539fbdde31..781a44a2d666 100644
--- a/modules/@angular/compiler/test/css_parser/css_lexer_spec.ts
+++ b/modules/@angular/compiler/test/css_parser/css_lexer_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {afterEach, beforeEach, ddescribe, describe, expect, iit, it, xit} from '../../../core/testing/testing_internal';
+import {describe, expect, it} from '../../../core/testing/testing_internal';
 import {CssLexer, CssLexerMode, CssScannerError, CssToken, CssTokenType} from '../../src/css_parser/css_lexer';
 import {isPresent} from '../../src/facade/lang';
 
diff --git a/modules/@angular/compiler/test/css_parser/css_parser_spec.ts b/modules/@angular/compiler/test/css_parser/css_parser_spec.ts
index 86710adfb90c..024f59f03a02 100644
--- a/modules/@angular/compiler/test/css_parser/css_parser_spec.ts
+++ b/modules/@angular/compiler/test/css_parser/css_parser_spec.ts
@@ -7,7 +7,7 @@
  */
 
 
-import {afterEach, beforeEach, ddescribe, describe, expect, iit, it, xit} from '../../../core/testing/testing_internal';
+import {describe, expect, it} from '../../../core/testing/testing_internal';
 import {CssBlockAst, CssBlockDefinitionRuleAst, CssBlockRuleAst, CssDefinitionAst, CssInlineRuleAst, CssKeyframeDefinitionAst, CssKeyframeRuleAst, CssMediaQueryRuleAst, CssSelectorRuleAst, CssStyleSheetAst, CssStyleValueAst} from '../../src/css_parser/css_ast';
 import {BlockType, CssParseError, CssParser, CssToken, ParsedCssResult} from '../../src/css_parser/css_parser';
 import {ParseLocation} from '../../src/parse_util';
diff --git a/modules/@angular/compiler/test/css_parser/css_visitor_spec.ts b/modules/@angular/compiler/test/css_parser/css_visitor_spec.ts
index e59014822e8c..19d2a63bf370 100644
--- a/modules/@angular/compiler/test/css_parser/css_visitor_spec.ts
+++ b/modules/@angular/compiler/test/css_parser/css_visitor_spec.ts
@@ -7,8 +7,8 @@
  */
 
 
-import {afterEach, beforeEach, ddescribe, describe, expect, iit, it, xit} from '../../../core/testing/testing_internal';
-import {CssAst, CssAstVisitor, CssAtRulePredicateAst, CssBlockAst, CssBlockDefinitionRuleAst, CssBlockRuleAst, CssDefinitionAst, CssInlineRuleAst, CssKeyframeDefinitionAst, CssKeyframeRuleAst, CssMediaQueryRuleAst, CssPseudoSelectorAst, CssRuleAst, CssSelectorAst, CssSelectorRuleAst, CssSimpleSelectorAst, CssStyleSheetAst, CssStyleValueAst, CssStylesBlockAst, CssUnknownRuleAst, CssUnknownTokenListAst} from '../../src/css_parser/css_ast';
+import {beforeEach, describe, expect, it} from '../../../core/testing/testing_internal';
+import {CssAst, CssAstVisitor, CssAtRulePredicateAst, CssBlockAst, CssDefinitionAst, CssInlineRuleAst, CssKeyframeDefinitionAst, CssKeyframeRuleAst, CssMediaQueryRuleAst, CssPseudoSelectorAst, CssRuleAst, CssSelectorAst, CssSelectorRuleAst, CssSimpleSelectorAst, CssStyleSheetAst, CssStyleValueAst, CssStylesBlockAst, CssUnknownRuleAst, CssUnknownTokenListAst} from '../../src/css_parser/css_ast';
 import {BlockType, CssParseError, CssParser, CssToken} from '../../src/css_parser/css_parser';
 import {isPresent} from '../../src/facade/lang';
 
diff --git a/modules/@angular/compiler/test/directive_lifecycle_spec.ts b/modules/@angular/compiler/test/directive_lifecycle_spec.ts
index d4b62ba40be4..aaee9d17edae 100644
--- a/modules/@angular/compiler/test/directive_lifecycle_spec.ts
+++ b/modules/@angular/compiler/test/directive_lifecycle_spec.ts
@@ -8,7 +8,7 @@
 
 import {hasLifecycleHook} from '@angular/compiler/src/lifecycle_reflector';
 import {LifecycleHooks} from '@angular/core/src/metadata/lifecycle_hooks';
-import {beforeEach, ddescribe, describe, expect, iit, inject, it, xdescribe} from '@angular/core/testing/testing_internal';
+import {describe, expect, it} from '@angular/core/testing/testing_internal';
 
 export function main() {
   describe('Create Directive', () => {
diff --git a/modules/@angular/compiler/test/directive_normalizer_spec.ts b/modules/@angular/compiler/test/directive_normalizer_spec.ts
index 839b0be86213..6e5ca9547450 100644
--- a/modules/@angular/compiler/test/directive_normalizer_spec.ts
+++ b/modules/@angular/compiler/test/directive_normalizer_spec.ts
@@ -14,7 +14,7 @@ import {MockResourceLoader} from '@angular/compiler/testing/resource_loader_mock
 import {TEST_COMPILER_PROVIDERS} from '@angular/compiler/testing/test_bindings';
 import {ViewEncapsulation} from '@angular/core/src/metadata/view';
 import {TestBed} from '@angular/core/testing';
-import {AsyncTestCompleter, beforeEach, beforeEachProviders, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {AsyncTestCompleter, beforeEach, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
 
 import {SpyResourceLoader} from './spies';
 
diff --git a/modules/@angular/compiler/test/expression_parser/unparser.ts b/modules/@angular/compiler/test/expression_parser/unparser.ts
index 6d1c835d9c4f..54ddf0790cc9 100644
--- a/modules/@angular/compiler/test/expression_parser/unparser.ts
+++ b/modules/@angular/compiler/test/expression_parser/unparser.ts
@@ -6,8 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AST, AstVisitor, Binary, BindingPipe, Chain, Conditional, EmptyExpr, FunctionCall, ImplicitReceiver, Interpolation, KeyedRead, KeyedWrite, LiteralArray, LiteralMap, LiteralPrimitive, MethodCall, PrefixNot, PropertyRead, PropertyWrite, Quote, SafeMethodCall, SafePropertyRead} from '../../src/expression_parser/ast';
-import {StringWrapper, isPresent, isString} from '../../src/facade/lang';
+import {AST, AstVisitor, Binary, BindingPipe, Chain, Conditional, FunctionCall, ImplicitReceiver, Interpolation, KeyedRead, KeyedWrite, LiteralArray, LiteralMap, LiteralPrimitive, MethodCall, PrefixNot, PropertyRead, PropertyWrite, Quote, SafeMethodCall, SafePropertyRead} from '../../src/expression_parser/ast';
+import {StringWrapper, isString} from '../../src/facade/lang';
 import {DEFAULT_INTERPOLATION_CONFIG, InterpolationConfig} from '../../src/ml_parser/interpolation_config';
 
 class Unparser implements AstVisitor {
diff --git a/modules/@angular/compiler/test/expression_parser/validator.ts b/modules/@angular/compiler/test/expression_parser/validator.ts
index f386352bf536..5b176976b3d5 100644
--- a/modules/@angular/compiler/test/expression_parser/validator.ts
+++ b/modules/@angular/compiler/test/expression_parser/validator.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AST, Binary, BindingPipe, Chain, Conditional, EmptyExpr, FunctionCall, ImplicitReceiver, Interpolation, KeyedRead, KeyedWrite, LiteralArray, LiteralMap, LiteralPrimitive, MethodCall, ParseSpan, PrefixNot, PropertyRead, PropertyWrite, Quote, RecursiveAstVisitor, SafeMethodCall, SafePropertyRead} from '../../src/expression_parser/ast';
+import {AST, Binary, BindingPipe, Chain, Conditional, FunctionCall, ImplicitReceiver, Interpolation, KeyedRead, KeyedWrite, LiteralArray, LiteralMap, LiteralPrimitive, MethodCall, ParseSpan, PrefixNot, PropertyRead, PropertyWrite, Quote, RecursiveAstVisitor, SafeMethodCall, SafePropertyRead} from '../../src/expression_parser/ast';
 
 import {unparse} from './unparser';
 
diff --git a/modules/@angular/compiler/test/i18n/digest_spec.ts b/modules/@angular/compiler/test/i18n/digest_spec.ts
index 08e45480a64c..b6c7c8055162 100644
--- a/modules/@angular/compiler/test/i18n/digest_spec.ts
+++ b/modules/@angular/compiler/test/i18n/digest_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {beforeEach, ddescribe, describe, expect, iit, inject, it, xdescribe, xit} from '@angular/core/testing/testing_internal';
+import {describe, expect, it} from '@angular/core/testing/testing_internal';
 
 import {sha1} from '../../src/i18n/digest';
 
diff --git a/modules/@angular/compiler/test/i18n/extractor_merger_spec.ts b/modules/@angular/compiler/test/i18n/extractor_merger_spec.ts
index fc51c963a239..dcb36154c78f 100644
--- a/modules/@angular/compiler/test/i18n/extractor_merger_spec.ts
+++ b/modules/@angular/compiler/test/i18n/extractor_merger_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {beforeEach, ddescribe, describe, expect, iit, inject, it, xdescribe, xit} from '@angular/core/testing/testing_internal';
+import {describe, expect, it} from '@angular/core/testing/testing_internal';
 
 import {digestMessage, serializeNodes as serializeI18nNodes} from '../../src/i18n/digest';
 import {extractMessages, mergeTranslations} from '../../src/i18n/extractor_merger';
diff --git a/modules/@angular/compiler/test/i18n/i18n_parser_spec.ts b/modules/@angular/compiler/test/i18n/i18n_parser_spec.ts
index 7a0063ed3521..1c6ae8940358 100644
--- a/modules/@angular/compiler/test/i18n/i18n_parser_spec.ts
+++ b/modules/@angular/compiler/test/i18n/i18n_parser_spec.ts
@@ -8,7 +8,7 @@
 
 import {extractMessages} from '@angular/compiler/src/i18n/extractor_merger';
 import {Message} from '@angular/compiler/src/i18n/i18n_ast';
-import {ddescribe, describe, expect, iit, it} from '@angular/core/testing/testing_internal';
+import {describe, expect, it} from '@angular/core/testing/testing_internal';
 
 import {serializeNodes} from '../../src/i18n/digest';
 import {HtmlParser} from '../../src/ml_parser/html_parser';
diff --git a/modules/@angular/compiler/test/i18n/message_bundle_spec.ts b/modules/@angular/compiler/test/i18n/message_bundle_spec.ts
index 2848bda17c28..c47c4e0bc426 100644
--- a/modules/@angular/compiler/test/i18n/message_bundle_spec.ts
+++ b/modules/@angular/compiler/test/i18n/message_bundle_spec.ts
@@ -8,7 +8,7 @@
 
 import * as i18n from '@angular/compiler/src/i18n/i18n_ast';
 import {Serializer} from '@angular/compiler/src/i18n/serializers/serializer';
-import {beforeEach, ddescribe, describe, expect, iit, inject, it, xdescribe, xit} from '@angular/core/testing/testing_internal';
+import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal';
 
 import {serializeNodes} from '../../src/i18n/digest';
 import {MessageBundle} from '../../src/i18n/message_bundle';
diff --git a/modules/@angular/compiler/test/i18n/serializers/placeholder_spec.ts b/modules/@angular/compiler/test/i18n/serializers/placeholder_spec.ts
index 3d24f7a3d790..ce6e3b181147 100644
--- a/modules/@angular/compiler/test/i18n/serializers/placeholder_spec.ts
+++ b/modules/@angular/compiler/test/i18n/serializers/placeholder_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {beforeEach, ddescribe, describe, expect, iit, inject, it, xdescribe, xit} from '@angular/core/testing/testing_internal';
+import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal';
 
 import {PlaceholderRegistry} from '../../../src/i18n/serializers/placeholder';
 
diff --git a/modules/@angular/compiler/test/i18n/serializers/xliff_spec.ts b/modules/@angular/compiler/test/i18n/serializers/xliff_spec.ts
index 93457db3f02c..48f376b23b73 100644
--- a/modules/@angular/compiler/test/i18n/serializers/xliff_spec.ts
+++ b/modules/@angular/compiler/test/i18n/serializers/xliff_spec.ts
@@ -7,7 +7,7 @@
  */
 
 import {Xliff} from '@angular/compiler/src/i18n/serializers/xliff';
-import {beforeEach, ddescribe, describe, expect, iit, inject, it, xdescribe, xit} from '@angular/core/testing/testing_internal';
+import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal';
 import {MessageBundle} from '../../../src/i18n/message_bundle';
 import {HtmlParser} from '../../../src/ml_parser/html_parser';
 import {DEFAULT_INTERPOLATION_CONFIG} from '../../../src/ml_parser/interpolation_config';
diff --git a/modules/@angular/compiler/test/i18n/serializers/xmb_spec.ts b/modules/@angular/compiler/test/i18n/serializers/xmb_spec.ts
index 817351737c7d..9243474d4c59 100644
--- a/modules/@angular/compiler/test/i18n/serializers/xmb_spec.ts
+++ b/modules/@angular/compiler/test/i18n/serializers/xmb_spec.ts
@@ -7,7 +7,7 @@
  */
 
 import {Xmb} from '@angular/compiler/src/i18n/serializers/xmb';
-import {beforeEach, ddescribe, describe, expect, iit, inject, it, xdescribe, xit} from '@angular/core/testing/testing_internal';
+import {describe, expect, it} from '@angular/core/testing/testing_internal';
 
 import {MessageBundle} from '../../../src/i18n/message_bundle';
 import {HtmlParser} from '../../../src/ml_parser/html_parser';
diff --git a/modules/@angular/compiler/test/i18n/serializers/xml_helper_spec.ts b/modules/@angular/compiler/test/i18n/serializers/xml_helper_spec.ts
index 98972f05cf1e..8bcd7e3d302a 100644
--- a/modules/@angular/compiler/test/i18n/serializers/xml_helper_spec.ts
+++ b/modules/@angular/compiler/test/i18n/serializers/xml_helper_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {beforeEach, ddescribe, describe, expect, iit, inject, it, xdescribe, xit} from '@angular/core/testing/testing_internal';
+import {describe, expect, it} from '@angular/core/testing/testing_internal';
 
 import * as xml from '../../../src/i18n/serializers/xml_helper';
 
diff --git a/modules/@angular/compiler/test/i18n/serializers/xtb_spec.ts b/modules/@angular/compiler/test/i18n/serializers/xtb_spec.ts
index 6511a3c2b36b..f096b0863dd8 100644
--- a/modules/@angular/compiler/test/i18n/serializers/xtb_spec.ts
+++ b/modules/@angular/compiler/test/i18n/serializers/xtb_spec.ts
@@ -7,7 +7,7 @@
  */
 
 import {escapeRegExp} from '@angular/core/src/facade/lang';
-import {beforeEach, ddescribe, describe, expect, iit, inject, it, xdescribe, xit} from '@angular/core/testing/testing_internal';
+import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal';
 
 import {MessageBundle} from '../../../src/i18n/message_bundle';
 import {Xtb} from '../../../src/i18n/serializers/xtb';
diff --git a/modules/@angular/compiler/test/ml_parser/ast_serializer_spec.ts b/modules/@angular/compiler/test/ml_parser/ast_serializer_spec.ts
index 4e5536f1da09..15f181c3c777 100644
--- a/modules/@angular/compiler/test/ml_parser/ast_serializer_spec.ts
+++ b/modules/@angular/compiler/test/ml_parser/ast_serializer_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {beforeEach, ddescribe, describe, expect, it} from '../../../core/testing/testing_internal';
+import {beforeEach, describe, expect, it} from '../../../core/testing/testing_internal';
 import * as html from '../../src/ml_parser/ast';
 import {HtmlParser} from '../../src/ml_parser/html_parser';
 
diff --git a/modules/@angular/compiler/test/ml_parser/html_parser_spec.ts b/modules/@angular/compiler/test/ml_parser/html_parser_spec.ts
index 49bb0e2ce981..f185c179df47 100644
--- a/modules/@angular/compiler/test/ml_parser/html_parser_spec.ts
+++ b/modules/@angular/compiler/test/ml_parser/html_parser_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {afterEach, beforeEach, ddescribe, describe, expect, iit, it, xit} from '../../../core/testing/testing_internal';
+import {beforeEach, describe, expect, it} from '../../../core/testing/testing_internal';
 import * as html from '../../src/ml_parser/ast';
 import {HtmlParser, ParseTreeResult, TreeError} from '../../src/ml_parser/html_parser';
 import {TokenType} from '../../src/ml_parser/lexer';
diff --git a/modules/@angular/compiler/test/ml_parser/icu_ast_expander_spec.ts b/modules/@angular/compiler/test/ml_parser/icu_ast_expander_spec.ts
index ee1126ccba29..e216462e3281 100644
--- a/modules/@angular/compiler/test/ml_parser/icu_ast_expander_spec.ts
+++ b/modules/@angular/compiler/test/ml_parser/icu_ast_expander_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ddescribe, describe, expect, iit, it} from '../../../core/testing/testing_internal';
+import {describe, expect, it} from '../../../core/testing/testing_internal';
 import * as html from '../../src/ml_parser/ast';
 import {HtmlParser} from '../../src/ml_parser/html_parser';
 import {ExpansionResult, expandNodes} from '../../src/ml_parser/icu_ast_expander';
diff --git a/modules/@angular/compiler/test/ml_parser/lexer_spec.ts b/modules/@angular/compiler/test/ml_parser/lexer_spec.ts
index c0910886bd4b..3ca4ced01358 100644
--- a/modules/@angular/compiler/test/ml_parser/lexer_spec.ts
+++ b/modules/@angular/compiler/test/ml_parser/lexer_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {afterEach, beforeEach, ddescribe, describe, expect, iit, it, xit} from '../../../core/testing/testing_internal';
+import {describe, expect, it} from '../../../core/testing/testing_internal';
 import {getHtmlTagDefinition} from '../../src/ml_parser/html_tags';
 import {InterpolationConfig} from '../../src/ml_parser/interpolation_config';
 import * as lex from '../../src/ml_parser/lexer';
diff --git a/modules/@angular/compiler/test/ng_module_resolver_mock_spec.ts b/modules/@angular/compiler/test/ng_module_resolver_mock_spec.ts
index eb409c350a89..6ad7df44d96b 100644
--- a/modules/@angular/compiler/test/ng_module_resolver_mock_spec.ts
+++ b/modules/@angular/compiler/test/ng_module_resolver_mock_spec.ts
@@ -7,9 +7,7 @@
  */
 
 import {Injector, NgModule} from '@angular/core';
-import {beforeEach, ddescribe, describe, expect, iit, inject, it} from '@angular/core/testing/testing_internal';
-
-import {isBlank, stringify} from '../src/facade/lang';
+import {beforeEach, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
 import {MockNgModuleResolver} from '../testing/index';
 
 export function main() {
diff --git a/modules/@angular/compiler/test/output/abstract_emitter_spec.ts b/modules/@angular/compiler/test/output/abstract_emitter_spec.ts
index d5b885e4b1c5..008c26a5f0ba 100644
--- a/modules/@angular/compiler/test/output/abstract_emitter_spec.ts
+++ b/modules/@angular/compiler/test/output/abstract_emitter_spec.ts
@@ -7,7 +7,7 @@
  */
 
 import {escapeIdentifier} from '@angular/compiler/src/output/abstract_emitter';
-import {beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {describe, expect, it} from '@angular/core/testing/testing_internal';
 
 export function main() {
   describe('AbstractEmitter', () => {
diff --git a/modules/@angular/compiler/test/output/js_emitter_spec.ts b/modules/@angular/compiler/test/output/js_emitter_spec.ts
index 77f0a28b700f..f293320358b5 100644
--- a/modules/@angular/compiler/test/output/js_emitter_spec.ts
+++ b/modules/@angular/compiler/test/output/js_emitter_spec.ts
@@ -9,7 +9,7 @@
 import {CompileIdentifierMetadata} from '@angular/compiler/src/compile_metadata';
 import {JavaScriptEmitter} from '@angular/compiler/src/output/js_emitter';
 import * as o from '@angular/compiler/src/output/output_ast';
-import {beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal';
 
 import {isBlank} from '../../src/facade/lang';
 
diff --git a/modules/@angular/compiler/test/output/output_emitter_codegen_typed.ts b/modules/@angular/compiler/test/output/output_emitter_codegen_typed.ts
index 40512a07725e..d614cc5160f3 100644
--- a/modules/@angular/compiler/test/output/output_emitter_codegen_typed.ts
+++ b/modules/@angular/compiler/test/output/output_emitter_codegen_typed.ts
@@ -7,7 +7,7 @@
  */
 
 // ATTENTION: This file will be overwritten with generated code by main()
-import * as o from '@angular/compiler/src/output/output_ast';
+
 import {TypeScriptEmitter} from '@angular/compiler/src/output/ts_emitter';
 
 import {print} from '../../src/facade/lang';
diff --git a/modules/@angular/compiler/test/output/output_emitter_spec.ts b/modules/@angular/compiler/test/output/output_emitter_spec.ts
index 186f1dc32fa0..72ce118ebaff 100644
--- a/modules/@angular/compiler/test/output/output_emitter_spec.ts
+++ b/modules/@angular/compiler/test/output/output_emitter_spec.ts
@@ -10,7 +10,7 @@ import {interpretStatements} from '@angular/compiler/src/output/output_interpret
 import {jitStatements} from '@angular/compiler/src/output/output_jit';
 import {EventEmitter} from '@angular/core';
 import {ViewType} from '@angular/core/src/linker/view_type';
-import {beforeEach, ddescribe, describe, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {beforeEach, describe, it} from '@angular/core/testing/testing_internal';
 import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
 import {browserDetection} from '@angular/platform-browser/testing/browser_util';
 import {expect} from '@angular/platform-browser/testing/matchers';
diff --git a/modules/@angular/compiler/test/output/ts_emitter_spec.ts b/modules/@angular/compiler/test/output/ts_emitter_spec.ts
index 562c8dd10713..ff3d782af817 100644
--- a/modules/@angular/compiler/test/output/ts_emitter_spec.ts
+++ b/modules/@angular/compiler/test/output/ts_emitter_spec.ts
@@ -9,7 +9,7 @@
 import {CompileIdentifierMetadata} from '@angular/compiler/src/compile_metadata';
 import * as o from '@angular/compiler/src/output/output_ast';
 import {TypeScriptEmitter} from '@angular/compiler/src/output/ts_emitter';
-import {beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal';
 
 import {isBlank} from '../../src/facade/lang';
 
diff --git a/modules/@angular/compiler/test/pipe_resolver_mock_spec.ts b/modules/@angular/compiler/test/pipe_resolver_mock_spec.ts
index 272767d98c84..4c5b51d77ce3 100644
--- a/modules/@angular/compiler/test/pipe_resolver_mock_spec.ts
+++ b/modules/@angular/compiler/test/pipe_resolver_mock_spec.ts
@@ -7,9 +7,7 @@
  */
 
 import {Injector, Pipe} from '@angular/core';
-import {beforeEach, ddescribe, describe, expect, iit, inject, it} from '@angular/core/testing/testing_internal';
-
-import {isBlank, stringify} from '../src/facade/lang';
+import {beforeEach, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
 import {MockPipeResolver} from '../testing/index';
 
 export function main() {
diff --git a/modules/@angular/compiler/test/resource_loader_mock_spec.ts b/modules/@angular/compiler/test/resource_loader_mock_spec.ts
index 9c22276e07b0..cda7fde65441 100644
--- a/modules/@angular/compiler/test/resource_loader_mock_spec.ts
+++ b/modules/@angular/compiler/test/resource_loader_mock_spec.ts
@@ -7,7 +7,7 @@
  */
 
 import {MockResourceLoader} from '@angular/compiler/testing/resource_loader_mock';
-import {AsyncTestCompleter, beforeEach, ddescribe, describe, expect, iit, inject, it} from '@angular/core/testing/testing_internal';
+import {AsyncTestCompleter, beforeEach, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
 import {isPresent} from '../src/facade/lang';
 
 export function main() {
diff --git a/modules/@angular/compiler/test/runtime_compiler_spec.ts b/modules/@angular/compiler/test/runtime_compiler_spec.ts
index fc6bfe60e2a2..ca161ee9280b 100644
--- a/modules/@angular/compiler/test/runtime_compiler_spec.ts
+++ b/modules/@angular/compiler/test/runtime_compiler_spec.ts
@@ -7,9 +7,9 @@
  */
 
 import {DirectiveResolver, ResourceLoader} from '@angular/compiler';
-import {Compiler, Component, ComponentFactory, Injectable, Injector, Input, NgModule, NgModuleFactory, Type} from '@angular/core';
-import {ComponentFixture, TestBed, async, fakeAsync, getTestBed, tick} from '@angular/core/testing';
-import {beforeEach, beforeEachProviders, ddescribe, describe, iit, inject, it, xdescribe, xit} from '@angular/core/testing/testing_internal';
+import {Compiler, Component, Injector, NgModule, NgModuleFactory} from '@angular/core';
+import {TestBed, async, fakeAsync, tick} from '@angular/core/testing';
+import {beforeEach, describe, inject, it} from '@angular/core/testing/testing_internal';
 import {expect} from '@angular/platform-browser/testing/matchers';
 
 import {stringify} from '../src/facade/lang';
diff --git a/modules/@angular/compiler/test/schema/dom_element_schema_registry_spec.ts b/modules/@angular/compiler/test/schema/dom_element_schema_registry_spec.ts
index 6ac675beb112..dee9bd9b4078 100644
--- a/modules/@angular/compiler/test/schema/dom_element_schema_registry_spec.ts
+++ b/modules/@angular/compiler/test/schema/dom_element_schema_registry_spec.ts
@@ -8,7 +8,7 @@
 
 import {DomElementSchemaRegistry} from '@angular/compiler/src/schema/dom_element_schema_registry';
 import {CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA, SecurityContext} from '@angular/core';
-import {beforeEach, ddescribe, describe, expect, iit, inject, it, xdescribe, xit} from '@angular/core/testing/testing_internal';
+import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal';
 import {browserDetection} from '@angular/platform-browser/testing/browser_util';
 
 import {Element} from '../../src/ml_parser/ast';
diff --git a/modules/@angular/compiler/test/shadow_css_spec.ts b/modules/@angular/compiler/test/shadow_css_spec.ts
index 4298e7a18b0e..7a50429f5f47 100644
--- a/modules/@angular/compiler/test/shadow_css_spec.ts
+++ b/modules/@angular/compiler/test/shadow_css_spec.ts
@@ -7,7 +7,7 @@
  */
 
 import {CssRule, ShadowCss, processRules} from '@angular/compiler/src/shadow_css';
-import {beforeEach, ddescribe, describe, expect, iit, it} from '@angular/core/testing/testing_internal';
+import {describe, expect, it} from '@angular/core/testing/testing_internal';
 import {normalizeCSS} from '@angular/platform-browser/testing/browser_util';
 
 export function main() {
diff --git a/modules/@angular/compiler/test/spies.ts b/modules/@angular/compiler/test/spies.ts
index 88d92fb263fa..118808a2c93b 100644
--- a/modules/@angular/compiler/test/spies.ts
+++ b/modules/@angular/compiler/test/spies.ts
@@ -8,7 +8,7 @@
 
 import {ResourceLoader} from '@angular/compiler/src/resource_loader';
 
-import {SpyObject, proxy} from '@angular/core/testing/testing_internal';
+import {SpyObject} from '@angular/core/testing/testing_internal';
 
 export class SpyResourceLoader extends SpyObject {
   constructor() { super(ResourceLoader); }
diff --git a/modules/@angular/compiler/test/template_parser/template_parser_spec.ts b/modules/@angular/compiler/test/template_parser/template_parser_spec.ts
index c477a4f542ab..f3786927888e 100644
--- a/modules/@angular/compiler/test/template_parser/template_parser_spec.ts
+++ b/modules/@angular/compiler/test/template_parser/template_parser_spec.ts
@@ -15,7 +15,7 @@ import {TEST_COMPILER_PROVIDERS} from '@angular/compiler/testing/test_bindings';
 import {SchemaMetadata, SecurityContext, Type} from '@angular/core';
 import {Console} from '@angular/core/src/console';
 import {TestBed} from '@angular/core/testing';
-import {afterEach, beforeEach, beforeEachProviders, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {beforeEach, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
 import {Identifiers, identifierToken, resolveIdentifierToken} from '../../src/identifiers';
 import {DEFAULT_INTERPOLATION_CONFIG, InterpolationConfig} from '../../src/ml_parser/interpolation_config';
 import {MockSchemaRegistry} from '../../testing/index';
diff --git a/modules/@angular/compiler/test/template_parser/template_preparser_spec.ts b/modules/@angular/compiler/test/template_parser/template_preparser_spec.ts
index f2abcb713488..e33c9796f2c5 100644
--- a/modules/@angular/compiler/test/template_parser/template_preparser_spec.ts
+++ b/modules/@angular/compiler/test/template_parser/template_preparser_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {afterEach, beforeEach, beforeEachProviders, ddescribe, describe, expect, iit, inject, it, xdescribe, xit} from '../../../core/testing/testing_internal';
+import {beforeEach, describe, expect, inject, it} from '../../../core/testing/testing_internal';
 import {Element} from '../../src/ml_parser/ast';
 import {HtmlParser} from '../../src/ml_parser/html_parser';
 import {PreparsedElement, PreparsedElementType, preparseElement} from '../../src/template_parser/template_preparser';
diff --git a/modules/@angular/compiler/test/url_resolver_spec.ts b/modules/@angular/compiler/test/url_resolver_spec.ts
index befe6ccb610d..d8b5d4021c7c 100644
--- a/modules/@angular/compiler/test/url_resolver_spec.ts
+++ b/modules/@angular/compiler/test/url_resolver_spec.ts
@@ -7,7 +7,7 @@
  */
 
 import {UrlResolver, createOfflineCompileUrlResolver} from '@angular/compiler/src/url_resolver';
-import {beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {beforeEach, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
 
 export function main() {
   describe('UrlResolver', () => {
diff --git a/modules/@angular/compiler/test/util_spec.ts b/modules/@angular/compiler/test/util_spec.ts
index 9885b4a77e61..6bae97cc261d 100644
--- a/modules/@angular/compiler/test/util_spec.ts
+++ b/modules/@angular/compiler/test/util_spec.ts
@@ -7,7 +7,7 @@
  */
 
 import {fakeAsync} from '@angular/core/testing/fake_async';
-import {beforeEach, beforeEachProviders, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {describe, expect, it} from '@angular/core/testing/testing_internal';
 
 import {SyncAsyncResult, splitAtColon} from '../src/util';
 
diff --git a/modules/@angular/core/src/animation/view_animation_map.ts b/modules/@angular/core/src/animation/view_animation_map.ts
index 1f013bf567ad..ac20292f9916 100644
--- a/modules/@angular/core/src/animation/view_animation_map.ts
+++ b/modules/@angular/core/src/animation/view_animation_map.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ListWrapper, StringMapWrapper} from '../facade/collection';
+import {StringMapWrapper} from '../facade/collection';
 import {isPresent} from '../facade/lang';
 
 import {AnimationPlayer} from './animation_player';
diff --git a/modules/@angular/core/src/linker/view.ts b/modules/@angular/core/src/linker/view.ts
index 23cae11b167a..b0e91bfe20be 100644
--- a/modules/@angular/core/src/linker/view.ts
+++ b/modules/@angular/core/src/linker/view.ts
@@ -7,7 +7,7 @@
  */
 
 import {AnimationGroupPlayer} from '../animation/animation_group_player';
-import {AnimationPlayer, NoOpAnimationPlayer} from '../animation/animation_player';
+import {AnimationPlayer} from '../animation/animation_player';
 import {queueAnimation} from '../animation/animation_queue';
 import {AnimationTransitionEvent} from '../animation/animation_transition_event';
 import {ViewAnimationMap} from '../animation/view_animation_map';
diff --git a/modules/@angular/core/src/metadata/directives.ts b/modules/@angular/core/src/metadata/directives.ts
index 9fc49cf5eb65..faacfb202f42 100644
--- a/modules/@angular/core/src/metadata/directives.ts
+++ b/modules/@angular/core/src/metadata/directives.ts
@@ -8,8 +8,7 @@
 
 import {AnimationEntryMetadata} from '../animation/metadata';
 import {ChangeDetectionStrategy} from '../change_detection/constants';
-import {Injectable, Provider} from '../di';
-import {isPresent} from '../facade/lang';
+import {Provider} from '../di';
 import {Type} from '../type';
 import {TypeDecorator, makeDecorator, makePropDecorator} from '../util/decorators';
 
diff --git a/modules/@angular/core/test/animation/active_animations_players_map_spec.ts b/modules/@angular/core/test/animation/active_animations_players_map_spec.ts
index 627953267f41..c00b88911d3c 100644
--- a/modules/@angular/core/test/animation/active_animations_players_map_spec.ts
+++ b/modules/@angular/core/test/animation/active_animations_players_map_spec.ts
@@ -10,10 +10,8 @@ import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
 import {el} from '@angular/platform-browser/testing/browser_util';
 
 import {ViewAnimationMap} from '../../src/animation/view_animation_map';
-import {isPresent} from '../../src/facade/lang';
-import {fakeAsync, flushMicrotasks} from '../../testing';
 import {MockAnimationPlayer} from '../../testing/mock_animation_player';
-import {AsyncTestCompleter, beforeEach, ddescribe, describe, expect, iit, inject, it, xdescribe, xit} from '../../testing/testing_internal';
+import {beforeEach, describe, expect, it} from '../../testing/testing_internal';
 
 export function main() {
   describe('ActiveAnimationsPlayersMap', function() {
diff --git a/modules/@angular/core/test/animation/animation_group_player_spec.ts b/modules/@angular/core/test/animation/animation_group_player_spec.ts
index 8bc8ff80740e..bb259cea5993 100644
--- a/modules/@angular/core/test/animation/animation_group_player_spec.ts
+++ b/modules/@angular/core/test/animation/animation_group_player_spec.ts
@@ -9,7 +9,7 @@
 import {AnimationGroupPlayer} from '../../src/animation/animation_group_player';
 import {fakeAsync, flushMicrotasks} from '../../testing';
 import {MockAnimationPlayer} from '../../testing/mock_animation_player';
-import {AsyncTestCompleter, beforeEach, ddescribe, describe, expect, iit, inject, it, xdescribe, xit} from '../../testing/testing_internal';
+import {beforeEach, describe, expect, it} from '../../testing/testing_internal';
 
 export function main() {
   describe('AnimationGroupPlayer', function() {
diff --git a/modules/@angular/core/test/animation/animation_player_spec.ts b/modules/@angular/core/test/animation/animation_player_spec.ts
index 227ff6e7e201..92d748474ceb 100644
--- a/modules/@angular/core/test/animation/animation_player_spec.ts
+++ b/modules/@angular/core/test/animation/animation_player_spec.ts
@@ -6,9 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AnimationPlayer, NoOpAnimationPlayer} from '../../src/animation/animation_player';
+import {NoOpAnimationPlayer} from '../../src/animation/animation_player';
 import {fakeAsync, flushMicrotasks} from '../../testing';
-import {AsyncTestCompleter, beforeEach, ddescribe, describe, expect, iit, inject, it, xdescribe, xit} from '../../testing/testing_internal';
+import {describe, expect, it} from '../../testing/testing_internal';
 
 export function main() {
   describe('NoOpAnimationPlayer', function() {
diff --git a/modules/@angular/core/test/animation/animation_sequence_player_spec.ts b/modules/@angular/core/test/animation/animation_sequence_player_spec.ts
index 841b61792ff0..5a90f991ed4e 100644
--- a/modules/@angular/core/test/animation/animation_sequence_player_spec.ts
+++ b/modules/@angular/core/test/animation/animation_sequence_player_spec.ts
@@ -7,10 +7,9 @@
  */
 
 import {AnimationSequencePlayer} from '../../src/animation/animation_sequence_player';
-import {isPresent} from '../../src/facade/lang';
 import {fakeAsync, flushMicrotasks} from '../../testing';
 import {MockAnimationPlayer} from '../../testing/mock_animation_player';
-import {AsyncTestCompleter, beforeEach, ddescribe, describe, expect, iit, inject, it, xdescribe, xit} from '../../testing/testing_internal';
+import {beforeEach, describe, expect, it} from '../../testing/testing_internal';
 
 export function main() {
   describe('AnimationSequencePlayer', function() {
diff --git a/modules/@angular/core/test/animation/animation_style_util_spec.ts b/modules/@angular/core/test/animation/animation_style_util_spec.ts
index a6af0bd91457..c0cab4cad01e 100644
--- a/modules/@angular/core/test/animation/animation_style_util_spec.ts
+++ b/modules/@angular/core/test/animation/animation_style_util_spec.ts
@@ -11,7 +11,7 @@ import {AnimationKeyframe} from '../../src/animation/animation_keyframe';
 import * as animationUtils from '../../src/animation/animation_style_util';
 import {AnimationStyles} from '../../src/animation/animation_styles';
 import {AUTO_STYLE} from '../../src/animation/metadata';
-import {AsyncTestCompleter, beforeEach, ddescribe, describe, expect, iit, inject, it, xdescribe, xit} from '../../testing/testing_internal';
+import {describe, expect, it} from '../../testing/testing_internal';
 
 export function main() {
   describe('Animation Style Utils', function() {
diff --git a/modules/@angular/core/test/application_init_spec.ts b/modules/@angular/core/test/application_init_spec.ts
index baa7bb2fae44..8875db65c8e7 100644
--- a/modules/@angular/core/test/application_init_spec.ts
+++ b/modules/@angular/core/test/application_init_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import {APP_INITIALIZER, ApplicationInitStatus} from '../src/application_init';
-import {TestBed, async, inject, withModule} from '../testing';
+import {TestBed, async, inject} from '../testing';
 
 export function main() {
   describe('ApplicationInitStatus', () => {
diff --git a/modules/@angular/core/test/application_module_spec.ts b/modules/@angular/core/test/application_module_spec.ts
index 80f69a96e364..4c78ce8ce30d 100644
--- a/modules/@angular/core/test/application_module_spec.ts
+++ b/modules/@angular/core/test/application_module_spec.ts
@@ -7,7 +7,7 @@
  */
 
 import {LOCALE_ID} from '@angular/core';
-import {beforeEach, beforeEachProviders, ddescribe, describe, expect, iit, inject, it, xdescribe, xit} from '../testing/testing_internal';
+import {describe, expect, inject, it} from '../testing/testing_internal';
 
 export function main() {
   describe('Application module', () => {
diff --git a/modules/@angular/core/test/application_ref_spec.ts b/modules/@angular/core/test/application_ref_spec.ts
index 29253647a454..d81744e9b8e3 100644
--- a/modules/@angular/core/test/application_ref_spec.ts
+++ b/modules/@angular/core/test/application_ref_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {APP_BOOTSTRAP_LISTENER, APP_INITIALIZER, ChangeDetectorRef, CompilerFactory, Component, Injector, NgModule, PlatformRef, Type} from '@angular/core';
+import {APP_BOOTSTRAP_LISTENER, APP_INITIALIZER, CompilerFactory, Component, NgModule, PlatformRef, Type} from '@angular/core';
 import {ApplicationRef, ApplicationRef_} from '@angular/core/src/application_ref';
 import {ErrorHandler} from '@angular/core/src/error_handler';
 import {ComponentRef} from '@angular/core/src/linker/component_factory';
diff --git a/modules/@angular/core/test/change_detection/change_detector_util_spec.ts b/modules/@angular/core/test/change_detection/change_detector_util_spec.ts
index 7d2f8f83ba59..42387a69d843 100644
--- a/modules/@angular/core/test/change_detection/change_detector_util_spec.ts
+++ b/modules/@angular/core/test/change_detection/change_detector_util_spec.ts
@@ -7,7 +7,7 @@
  */
 
 import {devModeEqual} from '@angular/core/src/change_detection/change_detection_util';
-import {afterEach, beforeEach, ddescribe, describe, expect, iit, it, xit} from '@angular/core/testing/testing_internal';
+import {describe, expect, it} from '@angular/core/testing/testing_internal';
 
 export function main() {
   describe('ChangeDetectionUtil', () => {
diff --git a/modules/@angular/core/test/change_detection/differs/default_iterable_differ_spec.ts b/modules/@angular/core/test/change_detection/differs/default_iterable_differ_spec.ts
index b34d7e4c73bd..9b2a878c0a4f 100644
--- a/modules/@angular/core/test/change_detection/differs/default_iterable_differ_spec.ts
+++ b/modules/@angular/core/test/change_detection/differs/default_iterable_differ_spec.ts
@@ -7,7 +7,7 @@
  */
 
 import {DefaultIterableDiffer, DefaultIterableDifferFactory} from '@angular/core/src/change_detection/differs/default_iterable_differ';
-import {afterEach, beforeEach, ddescribe, describe, expect, iit, it, xit} from '@angular/core/testing/testing_internal';
+import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal';
 
 import {ListWrapper} from '../../../src/facade/collection';
 import {NumberWrapper} from '../../../src/facade/lang';
diff --git a/modules/@angular/core/test/change_detection/differs/default_keyvalue_differ_spec.ts b/modules/@angular/core/test/change_detection/differs/default_keyvalue_differ_spec.ts
index 5054d107fbc9..82c1dd26b839 100644
--- a/modules/@angular/core/test/change_detection/differs/default_keyvalue_differ_spec.ts
+++ b/modules/@angular/core/test/change_detection/differs/default_keyvalue_differ_spec.ts
@@ -7,7 +7,7 @@
  */
 
 import {DefaultKeyValueDiffer, DefaultKeyValueDifferFactory} from '@angular/core/src/change_detection/differs/default_keyvalue_differ';
-import {afterEach, beforeEach, ddescribe, describe, expect, iit, it, xit} from '@angular/core/testing/testing_internal';
+import {afterEach, beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal';
 import {kvChangesAsString} from '../../change_detection/util';
 
 // todo(vicb): Update the code & tests for object equality
diff --git a/modules/@angular/core/test/change_detection/differs/iterable_differs_spec.ts b/modules/@angular/core/test/change_detection/differs/iterable_differs_spec.ts
index d9c86f219239..3730397781f2 100644
--- a/modules/@angular/core/test/change_detection/differs/iterable_differs_spec.ts
+++ b/modules/@angular/core/test/change_detection/differs/iterable_differs_spec.ts
@@ -6,9 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Injector, ReflectiveInjector} from '@angular/core';
+import {ReflectiveInjector} from '@angular/core';
 import {IterableDiffers} from '@angular/core/src/change_detection/differs/iterable_differs';
-import {afterEach, beforeEach, ddescribe, describe, expect, iit, it, xit} from '@angular/core/testing/testing_internal';
+import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal';
 
 import {SpyIterableDifferFactory} from '../../spies';
 
diff --git a/modules/@angular/core/test/debug/debug_node_spec.ts b/modules/@angular/core/test/debug/debug_node_spec.ts
index a4fed0f2bef8..f6e0850bac9e 100644
--- a/modules/@angular/core/test/debug/debug_node_spec.ts
+++ b/modules/@angular/core/test/debug/debug_node_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgFor, NgIf} from '@angular/common';
+
 import {Injectable, NO_ERRORS_SCHEMA} from '@angular/core';
 import {Component, Directive, Input} from '@angular/core/src/metadata';
 import {ComponentFixture, TestBed, async} from '@angular/core/testing';
diff --git a/modules/@angular/core/test/di/forward_ref_spec.ts b/modules/@angular/core/test/di/forward_ref_spec.ts
index e97be6bb399c..22dfcb9759c9 100644
--- a/modules/@angular/core/test/di/forward_ref_spec.ts
+++ b/modules/@angular/core/test/di/forward_ref_spec.ts
@@ -8,7 +8,7 @@
 
 import {Type} from '@angular/core';
 import {forwardRef, resolveForwardRef} from '@angular/core/src/di';
-import {beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {describe, expect, it} from '@angular/core/testing/testing_internal';
 
 export function main() {
   describe('forwardRef', function() {
diff --git a/modules/@angular/core/test/di/injector_spec.ts b/modules/@angular/core/test/di/injector_spec.ts
index 7d6e7e955f02..1f16e4cf623a 100644
--- a/modules/@angular/core/test/di/injector_spec.ts
+++ b/modules/@angular/core/test/di/injector_spec.ts
@@ -8,7 +8,7 @@
 
 
 import {Injector} from '@angular/core';
-import {beforeEach, ddescribe, describe, expect, iit, it} from '@angular/core/testing/testing_internal';
+import {describe, expect, it} from '@angular/core/testing/testing_internal';
 
 export function main() {
   describe('Injector.NULL', () => {
diff --git a/modules/@angular/core/test/di/reflective_key_spec.ts b/modules/@angular/core/test/di/reflective_key_spec.ts
index da3bcda5d573..fc1b9d887ad6 100644
--- a/modules/@angular/core/test/di/reflective_key_spec.ts
+++ b/modules/@angular/core/test/di/reflective_key_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {KeyRegistry, ReflectiveKey} from '@angular/core/src/di/reflective_key';
+import {KeyRegistry} from '@angular/core/src/di/reflective_key';
 
 export function main() {
   describe('key', function() {
diff --git a/modules/@angular/core/test/dom/dom_adapter_spec.ts b/modules/@angular/core/test/dom/dom_adapter_spec.ts
index 8e3390cd92fe..b265fb1d824a 100644
--- a/modules/@angular/core/test/dom/dom_adapter_spec.ts
+++ b/modules/@angular/core/test/dom/dom_adapter_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {beforeEach, beforeEachProviders, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal';
 import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
 import {el, stringifyElement} from '@angular/platform-browser/testing/browser_util';
 
diff --git a/modules/@angular/core/test/dom/shim_spec.ts b/modules/@angular/core/test/dom/shim_spec.ts
index 552e4d12a3f4..85fb6b2ab4c2 100644
--- a/modules/@angular/core/test/dom/shim_spec.ts
+++ b/modules/@angular/core/test/dom/shim_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {describe, expect, it} from '@angular/core/testing/testing_internal';
 
 export function main() {
   describe('Shim', () => {
diff --git a/modules/@angular/core/test/facade/observable_spec.ts b/modules/@angular/core/test/facade/observable_spec.ts
index 122ce63a307a..4950cf3cab5f 100644
--- a/modules/@angular/core/test/facade/observable_spec.ts
+++ b/modules/@angular/core/test/facade/observable_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AsyncTestCompleter, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
 
 import {Observable} from '../../src/facade/async';
 
diff --git a/modules/@angular/core/test/fake_async_spec.ts b/modules/@angular/core/test/fake_async_spec.ts
index 1358247ad305..ec233ae7c7dd 100644
--- a/modules/@angular/core/test/fake_async_spec.ts
+++ b/modules/@angular/core/test/fake_async_spec.ts
@@ -7,7 +7,7 @@
  */
 
 import {discardPeriodicTasks, fakeAsync, flushMicrotasks, tick} from '@angular/core/testing';
-import {Log, beforeEach, ddescribe, describe, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {Log, beforeEach, describe, inject, it} from '@angular/core/testing/testing_internal';
 import {expect} from '@angular/platform-browser/testing/matchers';
 
 import {Parser} from '../../compiler/src/expression_parser/parser';
diff --git a/modules/@angular/core/test/linker/change_detection_integration_spec.ts b/modules/@angular/core/test/linker/change_detection_integration_spec.ts
index 67d448419f83..bac67a04ff74 100644
--- a/modules/@angular/core/test/linker/change_detection_integration_spec.ts
+++ b/modules/@angular/core/test/linker/change_detection_integration_spec.ts
@@ -8,9 +8,9 @@
 
 import {ElementSchemaRegistry} from '@angular/compiler/src/schema/element_schema_registry';
 import {TEST_COMPILER_PROVIDERS} from '@angular/compiler/testing/test_bindings';
-import {AfterContentChecked, AfterContentInit, AfterViewChecked, AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, DebugElement, Directive, DoCheck, Injectable, Input, OnChanges, OnDestroy, OnInit, Output, Pipe, PipeTransform, RenderComponentType, Renderer, RootRenderer, SimpleChange, SimpleChanges, TemplateRef, Type, ViewContainerRef, WrappedValue, forwardRef} from '@angular/core';
+import {AfterContentChecked, AfterContentInit, AfterViewChecked, AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, DebugElement, Directive, DoCheck, Injectable, Input, OnChanges, OnDestroy, OnInit, Output, Pipe, PipeTransform, RenderComponentType, Renderer, RootRenderer, SimpleChange, SimpleChanges, TemplateRef, Type, ViewContainerRef, WrappedValue} from '@angular/core';
 import {DebugDomRenderer} from '@angular/core/src/debug/debug_renderer';
-import {ComponentFixture, TestBed, fakeAsync, flushMicrotasks, tick} from '@angular/core/testing';
+import {ComponentFixture, TestBed, fakeAsync} from '@angular/core/testing';
 import {By} from '@angular/platform-browser/src/dom/debug/by';
 import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
 import {DomRootRenderer} from '@angular/platform-browser/src/dom/dom_renderer';
@@ -18,7 +18,7 @@ import {DomRootRenderer} from '@angular/platform-browser/src/dom/dom_renderer';
 import {MockSchemaRegistry} from '../../../compiler/testing/index';
 import {EventEmitter} from '../../src/facade/async';
 import {StringMapWrapper} from '../../src/facade/collection';
-import {NumberWrapper, isBlank} from '../../src/facade/lang';
+import {NumberWrapper} from '../../src/facade/lang';
 
 export function main() {
   let elSchema: MockSchemaRegistry;
diff --git a/modules/@angular/core/test/linker/entry_components_integration_spec.ts b/modules/@angular/core/test/linker/entry_components_integration_spec.ts
index 9c7a9b76e10d..5febaf1b85db 100644
--- a/modules/@angular/core/test/linker/entry_components_integration_spec.ts
+++ b/modules/@angular/core/test/linker/entry_components_integration_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ANALYZE_FOR_ENTRY_COMPONENTS, Component, ComponentFactoryResolver, forwardRef} from '@angular/core';
+import {ANALYZE_FOR_ENTRY_COMPONENTS, Component, ComponentFactoryResolver} from '@angular/core';
 import {NoComponentFactoryError} from '@angular/core/src/linker/component_factory_resolver';
 import {TestBed} from '@angular/core/testing';
 
diff --git a/modules/@angular/core/test/linker/integration_spec.ts b/modules/@angular/core/test/linker/integration_spec.ts
index b2da73a7e094..47be830973f2 100644
--- a/modules/@angular/core/test/linker/integration_spec.ts
+++ b/modules/@angular/core/test/linker/integration_spec.ts
@@ -17,7 +17,7 @@ import {ViewContainerRef} from '@angular/core/src/linker/view_container_ref';
 import {EmbeddedViewRef} from '@angular/core/src/linker/view_ref';
 import {Attribute, Component, ContentChildren, Directive, HostBinding, HostListener, Input, Output, Pipe} from '@angular/core/src/metadata';
 import {Renderer} from '@angular/core/src/render';
-import {TestBed, async, fakeAsync, getTestBed, inject, tick} from '@angular/core/testing';
+import {TestBed, async, fakeAsync, getTestBed, tick} from '@angular/core/testing';
 import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
 import {dispatchEvent, el} from '@angular/platform-browser/testing/browser_util';
 import {expect} from '@angular/platform-browser/testing/matchers';
diff --git a/modules/@angular/core/test/linker/ng_container_integration_spec.ts b/modules/@angular/core/test/linker/ng_container_integration_spec.ts
index 1e4559cf8384..5d8856ab3d46 100644
--- a/modules/@angular/core/test/linker/ng_container_integration_spec.ts
+++ b/modules/@angular/core/test/linker/ng_container_integration_spec.ts
@@ -6,10 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgIf} from '@angular/common';
+
 import {AfterContentInit, AfterViewInit, Component, ContentChildren, Directive, Input, QueryList, ViewChildren} from '@angular/core';
-import {TestBed, async} from '@angular/core/testing';
-import {AsyncTestCompleter, beforeEach, beforeEachProviders, ddescribe, describe, iit, inject, it, xdescribe, xit} from '@angular/core/testing/testing_internal';
+import {TestBed} from '@angular/core/testing';
+import {beforeEach, describe, it} from '@angular/core/testing/testing_internal';
 import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
 import {expect} from '@angular/platform-browser/testing/matchers';
 
diff --git a/modules/@angular/core/test/linker/projection_integration_spec.ts b/modules/@angular/core/test/linker/projection_integration_spec.ts
index c41694cfa17d..206611fd2d9a 100644
--- a/modules/@angular/core/test/linker/projection_integration_spec.ts
+++ b/modules/@angular/core/test/linker/projection_integration_spec.ts
@@ -9,7 +9,7 @@
 import {Component, Directive, ElementRef, TemplateRef, ViewContainerRef, ViewEncapsulation} from '@angular/core';
 import {getAllDebugNodes} from '@angular/core/src/debug/debug_node';
 import {TestBed} from '@angular/core/testing';
-import {beforeEach, beforeEachProviders, ddescribe, describe, iit, inject, it, xdescribe, xit} from '@angular/core/testing/testing_internal';
+import {beforeEach, describe, it} from '@angular/core/testing/testing_internal';
 import {By} from '@angular/platform-browser/src/dom/debug/by';
 import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
 import {expect} from '@angular/platform-browser/testing/matchers';
diff --git a/modules/@angular/core/test/linker/query_list_spec.ts b/modules/@angular/core/test/linker/query_list_spec.ts
index 667a5d2cce22..6832fa7eb508 100644
--- a/modules/@angular/core/test/linker/query_list_spec.ts
+++ b/modules/@angular/core/test/linker/query_list_spec.ts
@@ -8,7 +8,7 @@
 
 import {QueryList} from '@angular/core/src/linker/query_list';
 import {fakeAsync, tick} from '@angular/core/testing';
-import {beforeEach, ddescribe, describe, expect, iit, it, xit} from '@angular/core/testing/testing_internal';
+import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal';
 import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
 
 import {iterateListLike} from '../../src/facade/collection';
diff --git a/modules/@angular/core/test/linker/regression_integration_spec.ts b/modules/@angular/core/test/linker/regression_integration_spec.ts
index 838e0bfc98f6..656806b2b87e 100644
--- a/modules/@angular/core/test/linker/regression_integration_spec.ts
+++ b/modules/@angular/core/test/linker/regression_integration_spec.ts
@@ -8,7 +8,7 @@
 
 import {Component, Injector, OpaqueToken, Pipe, PipeTransform, Provider} from '@angular/core';
 import {TestBed} from '@angular/core/testing';
-import {beforeEach, beforeEachProviders, ddescribe, describe, iit, inject, it, xdescribe, xit} from '@angular/core/testing/testing_internal';
+import {beforeEach, describe, it} from '@angular/core/testing/testing_internal';
 import {expect} from '@angular/platform-browser/testing/matchers';
 
 export function main() {
diff --git a/modules/@angular/core/test/linker/security_integration_spec.ts b/modules/@angular/core/test/linker/security_integration_spec.ts
index 625d50edd087..46670b3d7ae9 100644
--- a/modules/@angular/core/test/linker/security_integration_spec.ts
+++ b/modules/@angular/core/test/linker/security_integration_spec.ts
@@ -8,7 +8,7 @@
 
 import {Component, Directive, Input, NO_ERRORS_SCHEMA} from '@angular/core';
 import {ComponentFixture, TestBed, getTestBed} from '@angular/core/testing';
-import {afterEach, beforeEach, beforeEachProviders, ddescribe, describe, expect, iit, inject, it} from '@angular/core/testing/testing_internal';
+import {afterEach, beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal';
 import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
 import {DomSanitizer} from '@angular/platform-browser/src/security/dom_sanitization_service';
 
diff --git a/modules/@angular/core/test/linker/system_ng_module_factory_loader_spec.ts b/modules/@angular/core/test/linker/system_ng_module_factory_loader_spec.ts
index f5cf5e3f10bd..9f5c8a33a01b 100644
--- a/modules/@angular/core/test/linker/system_ng_module_factory_loader_spec.ts
+++ b/modules/@angular/core/test/linker/system_ng_module_factory_loader_spec.ts
@@ -8,7 +8,7 @@
 
 import {global} from '@angular/common/src/facade/lang';
 import {Compiler, SystemJsNgModuleLoader} from '@angular/core';
-import {async, tick} from '@angular/core/testing';
+import {async} from '@angular/core/testing';
 import {afterEach, beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal';
 
 function mockSystem(modules: {[module: string]: any}) {
diff --git a/modules/@angular/core/test/linker/view_injector_integration_spec.ts b/modules/@angular/core/test/linker/view_injector_integration_spec.ts
index 9e0995f68407..1481c03edb34 100644
--- a/modules/@angular/core/test/linker/view_injector_integration_spec.ts
+++ b/modules/@angular/core/test/linker/view_injector_integration_spec.ts
@@ -6,9 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Attribute, ChangeDetectionStrategy, ChangeDetectorRef, Component, DebugElement, Directive, ElementRef, Host, Inject, Input, Optional, Pipe, PipeTransform, Provider, Self, SkipSelf, TemplateRef, Type, ViewContainerRef, forwardRef} from '@angular/core';
-import {ComponentFixture, TestBed, fakeAsync, flushMicrotasks, tick} from '@angular/core/testing';
-import {beforeEach, beforeEachProviders, ddescribe, describe, iit, inject, it, xdescribe, xit} from '@angular/core/testing/testing_internal';
+import {Attribute, ChangeDetectionStrategy, ChangeDetectorRef, Component, DebugElement, Directive, ElementRef, Host, Inject, Input, Optional, Pipe, PipeTransform, Provider, Self, SkipSelf, TemplateRef, Type, ViewContainerRef} from '@angular/core';
+import {ComponentFixture, TestBed, fakeAsync} from '@angular/core/testing';
+import {beforeEach, beforeEachProviders, describe, it} from '@angular/core/testing/testing_internal';
 import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
 import {expect} from '@angular/platform-browser/testing/matchers';
 
diff --git a/modules/@angular/core/test/metadata/decorators_spec.ts b/modules/@angular/core/test/metadata/decorators_spec.ts
index b1b4b39d6633..017d888c317a 100644
--- a/modules/@angular/core/test/metadata/decorators_spec.ts
+++ b/modules/@angular/core/test/metadata/decorators_spec.ts
@@ -8,7 +8,7 @@
 
 import {Component, Directive} from '@angular/core';
 import {reflector} from '@angular/core/src/reflection/reflection';
-import {beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {describe, expect, it} from '@angular/core/testing/testing_internal';
 
 export function main() {
   describe('es5 decorators', () => {
diff --git a/modules/@angular/core/test/reflection/reflector_spec.ts b/modules/@angular/core/test/reflection/reflector_spec.ts
index 22b7d701a99f..ccf84440eed5 100644
--- a/modules/@angular/core/test/reflection/reflector_spec.ts
+++ b/modules/@angular/core/test/reflection/reflector_spec.ts
@@ -9,10 +9,9 @@
 import {OnInit} from '@angular/core';
 import {ReflectionInfo, Reflector} from '@angular/core/src/reflection/reflection';
 import {ReflectionCapabilities} from '@angular/core/src/reflection/reflection_capabilities';
-import {beforeEach, ddescribe, describe, expect, iit, it} from '@angular/core/testing/testing_internal';
-import {browserDetection} from '@angular/platform-browser/testing/browser_util';
+import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal';
 
-import {ClassDecorator, HasGetterAndSetterDecorators, ParamDecorator, PropDecorator, classDecorator, paramDecorator, propDecorator} from './reflector_common';
+import {ClassDecorator, ParamDecorator, PropDecorator, classDecorator, paramDecorator, propDecorator} from './reflector_common';
 
 class AType {
   value: any /** TODO #9100 */;
diff --git a/modules/@angular/core/test/testability/testability_spec.ts b/modules/@angular/core/test/testability/testability_spec.ts
index 7b57a7cac014..8f89bdcfed8c 100644
--- a/modules/@angular/core/test/testability/testability_spec.ts
+++ b/modules/@angular/core/test/testability/testability_spec.ts
@@ -9,10 +9,10 @@
 import {Injectable} from '@angular/core/src/di';
 import {Testability} from '@angular/core/src/testability/testability';
 import {NgZone} from '@angular/core/src/zone/ng_zone';
-import {AsyncTestCompleter, SpyObject, beforeEach, ddescribe, describe, expect, iit, inject, it, xdescribe, xit} from '@angular/core/testing/testing_internal';
+import {AsyncTestCompleter, SpyObject, beforeEach, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
 
 import {EventEmitter} from '../../src/facade/async';
-import {normalizeBlank, scheduleMicroTask} from '../../src/facade/lang';
+import {scheduleMicroTask} from '../../src/facade/lang';
 
 
 // Schedules a microtasks (using a resolved promise .then())
diff --git a/modules/@angular/core/test/util/decorators_spec.ts b/modules/@angular/core/test/util/decorators_spec.ts
index 325c2184ef4c..a1725ab10a9f 100644
--- a/modules/@angular/core/test/util/decorators_spec.ts
+++ b/modules/@angular/core/test/util/decorators_spec.ts
@@ -8,8 +8,8 @@
 
 import {Inject} from '@angular/core';
 import {reflector} from '@angular/core/src/reflection/reflection';
-import {Class, makeDecorator, makeParamDecorator} from '@angular/core/src/util/decorators';
-import {beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {Class, makeDecorator} from '@angular/core/src/util/decorators';
+import {describe, expect, it} from '@angular/core/testing/testing_internal';
 
 import {global} from '../../src/facade/lang';
 
diff --git a/modules/@angular/core/test/zone/ng_zone_spec.ts b/modules/@angular/core/test/zone/ng_zone_spec.ts
index e25df1cb93ee..5f7a99354c90 100644
--- a/modules/@angular/core/test/zone/ng_zone_spec.ts
+++ b/modules/@angular/core/test/zone/ng_zone_spec.ts
@@ -8,7 +8,7 @@
 
 import {NgZone} from '@angular/core/src/zone/ng_zone';
 import {async, fakeAsync, flushMicrotasks} from '@angular/core/testing';
-import {AsyncTestCompleter, Log, beforeEach, ddescribe, describe, expect, iit, inject, it, xdescribe, xit} from '@angular/core/testing/testing_internal';
+import {AsyncTestCompleter, Log, beforeEach, describe, expect, inject, it, xit} from '@angular/core/testing/testing_internal';
 import {browserDetection} from '@angular/platform-browser/testing/browser_util';
 import {BaseError} from '../../src/facade/errors';
 import {isPresent, scheduleMicroTask} from '../../src/facade/lang';
diff --git a/modules/@angular/core/testing/test_bed.ts b/modules/@angular/core/testing/test_bed.ts
index e519228f8ebc..41ee685ab3c5 100644
--- a/modules/@angular/core/testing/test_bed.ts
+++ b/modules/@angular/core/testing/test_bed.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {CompilerOptions, Component, Directive, Injector, ModuleWithComponentFactories, NgModule, NgModuleFactory, NgModuleRef, NgZone, OpaqueToken, Pipe, PlatformRef, Provider, SchemaMetadata, Type} from '@angular/core';
+import {CompilerOptions, Component, Directive, Injector, ModuleWithComponentFactories, NgModule, NgModuleRef, NgZone, OpaqueToken, Pipe, PlatformRef, Provider, SchemaMetadata, Type} from '@angular/core';
 import {AsyncTestCompleter} from './async_test_completer';
 import {ComponentFixture} from './component_fixture';
 import {stringify} from './facade/lang';
diff --git a/modules/@angular/examples/common/pipes/ts/async_pipe.ts b/modules/@angular/examples/common/pipes/ts/async_pipe.ts
index d746d9ac8c04..63b4f2c4523c 100644
--- a/modules/@angular/examples/common/pipes/ts/async_pipe.ts
+++ b/modules/@angular/examples/common/pipes/ts/async_pipe.ts
@@ -6,9 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Component, NgModule} from '@angular/core';
-import {BrowserModule} from '@angular/platform-browser';
-import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
+import {Component} from '@angular/core';
 import {Observable} from 'rxjs/Observable';
 import {Subscriber} from 'rxjs/Subscriber';
 
diff --git a/modules/@angular/examples/common/pipes/ts/date_pipe.ts b/modules/@angular/examples/common/pipes/ts/date_pipe.ts
index 81872b4ea3c5..5b518524ce58 100644
--- a/modules/@angular/examples/common/pipes/ts/date_pipe.ts
+++ b/modules/@angular/examples/common/pipes/ts/date_pipe.ts
@@ -6,9 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Component, NgModule} from '@angular/core';
-import {BrowserModule} from '@angular/platform-browser';
-import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
+import {Component} from '@angular/core';
 
 // #docregion DatePipe
 @Component({
diff --git a/modules/@angular/examples/common/pipes/ts/i18n_pipe.ts b/modules/@angular/examples/common/pipes/ts/i18n_pipe.ts
index 8b73d0d6ad11..98088e3eb7a5 100644
--- a/modules/@angular/examples/common/pipes/ts/i18n_pipe.ts
+++ b/modules/@angular/examples/common/pipes/ts/i18n_pipe.ts
@@ -6,11 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Component, NgModule} from '@angular/core';
-import {BrowserModule} from '@angular/platform-browser';
-import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
-import {Observable} from 'rxjs/Observable';
-import {Subscriber} from 'rxjs/Subscriber';
+import {Component} from '@angular/core';
 
 // #docregion I18nPluralPipeComponent
 @Component({
diff --git a/modules/@angular/examples/common/pipes/ts/json_pipe.ts b/modules/@angular/examples/common/pipes/ts/json_pipe.ts
index fab6b4b06051..68a8035e60b3 100644
--- a/modules/@angular/examples/common/pipes/ts/json_pipe.ts
+++ b/modules/@angular/examples/common/pipes/ts/json_pipe.ts
@@ -6,9 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Component, NgModule} from '@angular/core';
-import {BrowserModule} from '@angular/platform-browser';
-import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
+import {Component} from '@angular/core';
 
 // #docregion JsonPipe
 @Component({
diff --git a/modules/@angular/examples/common/pipes/ts/lowerupper_pipe.ts b/modules/@angular/examples/common/pipes/ts/lowerupper_pipe.ts
index cf6b4ffb422e..ad071916edda 100644
--- a/modules/@angular/examples/common/pipes/ts/lowerupper_pipe.ts
+++ b/modules/@angular/examples/common/pipes/ts/lowerupper_pipe.ts
@@ -6,9 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Component, NgModule} from '@angular/core';
-import {BrowserModule} from '@angular/platform-browser';
-import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
+import {Component} from '@angular/core';
 
 // #docregion LowerUpperPipe
 @Component({
diff --git a/modules/@angular/examples/common/pipes/ts/number_pipe.ts b/modules/@angular/examples/common/pipes/ts/number_pipe.ts
index ba8612a4c323..aa9d595db1cb 100644
--- a/modules/@angular/examples/common/pipes/ts/number_pipe.ts
+++ b/modules/@angular/examples/common/pipes/ts/number_pipe.ts
@@ -6,9 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Component, NgModule} from '@angular/core';
-import {BrowserModule} from '@angular/platform-browser';
-import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
+import {Component} from '@angular/core';
 
 // #docregion NumberPipe
 @Component({
diff --git a/modules/@angular/examples/common/pipes/ts/slice_pipe.ts b/modules/@angular/examples/common/pipes/ts/slice_pipe.ts
index b43ab58e73b7..cccb625c5a15 100644
--- a/modules/@angular/examples/common/pipes/ts/slice_pipe.ts
+++ b/modules/@angular/examples/common/pipes/ts/slice_pipe.ts
@@ -6,9 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Component, NgModule} from '@angular/core';
-import {BrowserModule} from '@angular/platform-browser';
-import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
+import {Component} from '@angular/core';
 
 // #docregion SlicePipe_string
 @Component({
diff --git a/modules/@angular/examples/core/di/ts/contentChild/content_child_howto.ts b/modules/@angular/examples/core/di/ts/contentChild/content_child_howto.ts
index 2168fdab2f94..830aca8d3bb0 100644
--- a/modules/@angular/examples/core/di/ts/contentChild/content_child_howto.ts
+++ b/modules/@angular/examples/core/di/ts/contentChild/content_child_howto.ts
@@ -7,7 +7,7 @@
  */
 
 // #docregion HowTo
-import {AfterContentInit, Component, ContentChild, Directive, QueryList} from '@angular/core';
+import {AfterContentInit, ContentChild, Directive} from '@angular/core';
 
 @Directive({selector: 'child-directive'})
 class ChildDirective {
diff --git a/modules/@angular/examples/core/di/ts/contentChildren/content_children_howto.ts b/modules/@angular/examples/core/di/ts/contentChildren/content_children_howto.ts
index 48dbd7260239..268f5fefdf0a 100644
--- a/modules/@angular/examples/core/di/ts/contentChildren/content_children_howto.ts
+++ b/modules/@angular/examples/core/di/ts/contentChildren/content_children_howto.ts
@@ -7,7 +7,7 @@
  */
 
 // #docregion HowTo
-import {AfterContentInit, Component, ContentChildren, Directive, QueryList} from '@angular/core';
+import {AfterContentInit, ContentChildren, Directive, QueryList} from '@angular/core';
 
 @Directive({selector: 'child-directive'})
 class ChildDirective {
diff --git a/modules/@angular/examples/core/di/ts/forward_ref/forward_ref_spec.ts b/modules/@angular/examples/core/di/ts/forward_ref/forward_ref_spec.ts
index f93001fa6956..343b34f43f49 100644
--- a/modules/@angular/examples/core/di/ts/forward_ref/forward_ref_spec.ts
+++ b/modules/@angular/examples/core/di/ts/forward_ref/forward_ref_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ForwardRefFn, Inject, ReflectiveInjector, forwardRef, resolveForwardRef} from '@angular/core';
+import {Inject, ReflectiveInjector, forwardRef, resolveForwardRef} from '@angular/core';
 
 export function main() {
   describe('forwardRef examples', () => {
diff --git a/modules/@angular/examples/core/di/ts/provider_spec.ts b/modules/@angular/examples/core/di/ts/provider_spec.ts
index 31d2c4c73907..a2911d3d9ec0 100644
--- a/modules/@angular/examples/core/di/ts/provider_spec.ts
+++ b/modules/@angular/examples/core/di/ts/provider_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Inject, Injectable, OpaqueToken, Optional, ReflectiveInjector, ValueProvider} from '@angular/core';
+import {Inject, Injectable, OpaqueToken, Optional, ReflectiveInjector} from '@angular/core';
 
 export function main() {
   describe('Provider examples', () => {
diff --git a/modules/@angular/examples/core/di/ts/viewChild/view_child_example.ts b/modules/@angular/examples/core/di/ts/viewChild/view_child_example.ts
index a2108de5b617..8611d9037dc4 100644
--- a/modules/@angular/examples/core/di/ts/viewChild/view_child_example.ts
+++ b/modules/@angular/examples/core/di/ts/viewChild/view_child_example.ts
@@ -7,7 +7,7 @@
  */
 
 // #docregion Component
-import {AfterViewInit, Component, Directive, Input, ViewChild} from '@angular/core';
+import {Component, Directive, Input, ViewChild} from '@angular/core';
 
 @Directive({selector: 'pane'})
 export class Pane {
diff --git a/modules/@angular/examples/core/di/ts/viewChild/view_child_howto.ts b/modules/@angular/examples/core/di/ts/viewChild/view_child_howto.ts
index 604846cf3a86..fb36209ad413 100644
--- a/modules/@angular/examples/core/di/ts/viewChild/view_child_howto.ts
+++ b/modules/@angular/examples/core/di/ts/viewChild/view_child_howto.ts
@@ -7,7 +7,7 @@
  */
 
 // #docregion HowTo
-import {AfterViewInit, Component, Directive, QueryList, ViewChild} from '@angular/core';
+import {AfterViewInit, Component, Directive, ViewChild} from '@angular/core';
 
 @Directive({selector: 'child-directive'})
 class ChildDirective {
diff --git a/modules/@angular/examples/core/ts/metadata/lifecycle_hooks_spec.ts b/modules/@angular/examples/core/ts/metadata/lifecycle_hooks_spec.ts
index 76bfd99358d1..479ba04337c9 100644
--- a/modules/@angular/examples/core/ts/metadata/lifecycle_hooks_spec.ts
+++ b/modules/@angular/examples/core/ts/metadata/lifecycle_hooks_spec.ts
@@ -7,7 +7,7 @@
  */
 
 import {AfterContentChecked, AfterContentInit, AfterViewChecked, AfterViewInit, Component, DoCheck, Input, OnChanges, OnDestroy, OnInit, SimpleChanges, Type} from '@angular/core';
-import {ComponentFixture, TestBed} from '@angular/core/testing';
+import {TestBed} from '@angular/core/testing';
 
 export function main() {
   describe('lifecycle hooks examples', () => {
diff --git a/modules/@angular/examples/core/ts/platform/platform.ts b/modules/@angular/examples/core/ts/platform/platform.ts
index 6dacc098c230..d667351496cb 100644
--- a/modules/@angular/examples/core/ts/platform/platform.ts
+++ b/modules/@angular/examples/core/ts/platform/platform.ts
@@ -6,8 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Component, ReflectiveInjector, createPlatformFactory} from '@angular/core';
-import {BrowserModule} from '@angular/platform-browser';
+import {Component, createPlatformFactory} from '@angular/core';
 import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
 
 // #docregion longform
diff --git a/modules/@angular/examples/forms/ts/nestedFormArray/nested_form_array_example.ts b/modules/@angular/examples/forms/ts/nestedFormArray/nested_form_array_example.ts
index e42b5a703a8a..c7daf00a238f 100644
--- a/modules/@angular/examples/forms/ts/nestedFormArray/nested_form_array_example.ts
+++ b/modules/@angular/examples/forms/ts/nestedFormArray/nested_form_array_example.ts
@@ -8,7 +8,7 @@
 
 // #docregion Component
 import {Component} from '@angular/core';
-import {AbstractControl, FormArray, FormControl, FormGroup} from '@angular/forms';
+import {FormArray, FormControl, FormGroup} from '@angular/forms';
 
 @Component({
   selector: 'example-app',
diff --git a/modules/@angular/facade/src/collection.ts b/modules/@angular/facade/src/collection.ts
index 6f73771f01c7..49a0b2ed7a88 100644
--- a/modules/@angular/facade/src/collection.ts
+++ b/modules/@angular/facade/src/collection.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {getSymbolIterator, global, isArray, isBlank, isJsObject, isPresent} from './lang';
+import {getSymbolIterator, isArray, isBlank, isJsObject, isPresent} from './lang';
 
 // Safari and Internet Explorer do not support the iterable parameter to the
 // Map constructor.  We work around that by manually adding the items.
diff --git a/modules/@angular/facade/test/async_spec.ts b/modules/@angular/facade/test/async_spec.ts
index 09b4cac2f191..70a864989c06 100644
--- a/modules/@angular/facade/test/async_spec.ts
+++ b/modules/@angular/facade/test/async_spec.ts
@@ -6,9 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AsyncTestCompleter, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
-import {browserDetection} from '@angular/platform-browser/testing/browser_util';
-import {EventEmitter, Observable, Subject} from '../src/async';
+import {AsyncTestCompleter, beforeEach, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
+import {EventEmitter} from '../src/async';
 
 export function main() {
   describe('EventEmitter', () => {
diff --git a/modules/@angular/forms/src/directives/radio_control_value_accessor.ts b/modules/@angular/forms/src/directives/radio_control_value_accessor.ts
index db276859430e..29813d857c34 100644
--- a/modules/@angular/forms/src/directives/radio_control_value_accessor.ts
+++ b/modules/@angular/forms/src/directives/radio_control_value_accessor.ts
@@ -9,7 +9,6 @@
 import {Directive, ElementRef, Injectable, Injector, Input, OnDestroy, OnInit, Renderer, forwardRef} from '@angular/core';
 
 import {ListWrapper} from '../facade/collection';
-import {isPresent} from '../facade/lang';
 
 import {ControlValueAccessor, NG_VALUE_ACCESSOR} from './control_value_accessor';
 import {NgControl} from './ng_control';
diff --git a/modules/@angular/forms/test/directives_spec.ts b/modules/@angular/forms/test/directives_spec.ts
index 15286e7b95c1..eb48c3fd696b 100644
--- a/modules/@angular/forms/test/directives_spec.ts
+++ b/modules/@angular/forms/test/directives_spec.ts
@@ -8,7 +8,7 @@
 
 import {SimpleChange} from '@angular/core/src/change_detection';
 import {fakeAsync, flushMicrotasks, tick} from '@angular/core/testing';
-import {Log, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal';
 import {CheckboxControlValueAccessor, ControlValueAccessor, DefaultValueAccessor, FormArray, FormArrayName, FormControl, FormControlDirective, FormControlName, FormGroup, FormGroupDirective, FormGroupName, NgControl, NgForm, NgModel, NgModelGroup, SelectControlValueAccessor, SelectMultipleControlValueAccessor, Validator, Validators} from '@angular/forms';
 import {composeValidators, selectValueAccessor} from '@angular/forms/src/directives/shared';
 
diff --git a/modules/@angular/forms/test/form_array_spec.ts b/modules/@angular/forms/test/form_array_spec.ts
index c5fadaa8054a..f5d09b8dd126 100644
--- a/modules/@angular/forms/test/form_array_spec.ts
+++ b/modules/@angular/forms/test/form_array_spec.ts
@@ -7,7 +7,7 @@
  */
 
 import {fakeAsync, tick} from '@angular/core/testing';
-import {AsyncTestCompleter, beforeEach, ddescribe, describe, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {AsyncTestCompleter, beforeEach, describe, inject, it} from '@angular/core/testing/testing_internal';
 import {AbstractControl, FormArray, FormControl, FormGroup} from '@angular/forms';
 
 import {isPresent} from '../src/facade/lang';
diff --git a/modules/@angular/forms/test/form_builder_spec.ts b/modules/@angular/forms/test/form_builder_spec.ts
index 51e6c6ba371a..05d17175f473 100644
--- a/modules/@angular/forms/test/form_builder_spec.ts
+++ b/modules/@angular/forms/test/form_builder_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {afterEach, beforeEach, ddescribe, describe, expect, iit, it, xit} from '@angular/core/testing/testing_internal';
+import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal';
 import {FormBuilder} from '@angular/forms';
 
 export function main() {
diff --git a/modules/@angular/forms/test/form_control_spec.ts b/modules/@angular/forms/test/form_control_spec.ts
index 2c3471a03b74..4087d914e5c4 100644
--- a/modules/@angular/forms/test/form_control_spec.ts
+++ b/modules/@angular/forms/test/form_control_spec.ts
@@ -7,7 +7,7 @@
  */
 
 import {fakeAsync, tick} from '@angular/core/testing';
-import {AsyncTestCompleter, beforeEach, ddescribe, describe, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {AsyncTestCompleter, beforeEach, describe, inject, it} from '@angular/core/testing/testing_internal';
 import {FormControl, FormGroup, Validators} from '@angular/forms';
 
 import {EventEmitter} from '../src/facade/async';
diff --git a/modules/@angular/forms/test/form_group_spec.ts b/modules/@angular/forms/test/form_group_spec.ts
index 4bc4e2295f0d..4d787ee6a471 100644
--- a/modules/@angular/forms/test/form_group_spec.ts
+++ b/modules/@angular/forms/test/form_group_spec.ts
@@ -7,7 +7,7 @@
  */
 
 import {async, fakeAsync, tick} from '@angular/core/testing';
-import {AsyncTestCompleter, beforeEach, ddescribe, describe, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {AsyncTestCompleter, beforeEach, describe, inject, it} from '@angular/core/testing/testing_internal';
 import {AbstractControl, FormControl, FormGroup, Validators} from '@angular/forms';
 
 import {EventEmitter} from '../src/facade/async';
diff --git a/modules/@angular/forms/test/spies.ts b/modules/@angular/forms/test/spies.ts
index 6c4d6bb722d3..6338e5252c98 100644
--- a/modules/@angular/forms/test/spies.ts
+++ b/modules/@angular/forms/test/spies.ts
@@ -7,7 +7,7 @@
  */
 
 import {ChangeDetectorRef} from '@angular/core/src/change_detection/change_detector_ref';
-import {SpyObject, proxy} from '@angular/core/testing/testing_internal';
+import {SpyObject} from '@angular/core/testing/testing_internal';
 
 export class SpyChangeDetectorRef extends SpyObject {
   constructor() {
diff --git a/modules/@angular/forms/test/validators_spec.ts b/modules/@angular/forms/test/validators_spec.ts
index 98fae5b530e9..921965171d93 100644
--- a/modules/@angular/forms/test/validators_spec.ts
+++ b/modules/@angular/forms/test/validators_spec.ts
@@ -7,7 +7,7 @@
  */
 
 import {fakeAsync, tick} from '@angular/core/testing';
-import {afterEach, beforeEach, ddescribe, describe, expect, iit, it, xit} from '@angular/core/testing/testing_internal';
+import {describe, expect, it} from '@angular/core/testing/testing_internal';
 import {AbstractControl, FormControl, Validators} from '@angular/forms';
 import {Observable} from 'rxjs/Observable';
 
diff --git a/modules/@angular/http/src/backends/jsonp_backend.ts b/modules/@angular/http/src/backends/jsonp_backend.ts
index 77cbead811be..ff736aa73d97 100644
--- a/modules/@angular/http/src/backends/jsonp_backend.ts
+++ b/modules/@angular/http/src/backends/jsonp_backend.ts
@@ -10,7 +10,7 @@ import {Injectable} from '@angular/core';
 import {Observable} from 'rxjs/Observable';
 import {Observer} from 'rxjs/Observer';
 
-import {BaseResponseOptions, ResponseOptions} from '../base_response_options';
+import {ResponseOptions} from '../base_response_options';
 import {ReadyState, RequestMethod, ResponseType} from '../enums';
 import {StringWrapper, isPresent} from '../facade/lang';
 import {Connection, ConnectionBackend} from '../interfaces';
diff --git a/modules/@angular/http/src/base_response_options.ts b/modules/@angular/http/src/base_response_options.ts
index ffdf0f315405..03c5a7e91489 100644
--- a/modules/@angular/http/src/base_response_options.ts
+++ b/modules/@angular/http/src/base_response_options.ts
@@ -8,7 +8,7 @@
 
 import {Injectable} from '@angular/core';
 
-import {isJsObject, isPresent} from '../src/facade/lang';
+import {isPresent} from '../src/facade/lang';
 
 import {ResponseType} from './enums';
 import {Headers} from './headers';
diff --git a/modules/@angular/http/src/http.ts b/modules/@angular/http/src/http.ts
index 7dab9ff00740..3789ffdf66e6 100644
--- a/modules/@angular/http/src/http.ts
+++ b/modules/@angular/http/src/http.ts
@@ -16,7 +16,6 @@ import {RequestMethod} from './enums';
 import {ConnectionBackend, RequestOptionsArgs} from './interfaces';
 import {Request} from './static_request';
 import {Response} from './static_response';
-import {URLSearchParams} from './url_search_params';
 
 function httpRequest(backend: ConnectionBackend, request: Request): Observable<Response> {
   return backend.createConnection(request).response;
diff --git a/modules/@angular/http/src/static_response.ts b/modules/@angular/http/src/static_response.ts
index e423ecc12a21..892edaa7433c 100644
--- a/modules/@angular/http/src/static_response.ts
+++ b/modules/@angular/http/src/static_response.ts
@@ -6,13 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Json, isString} from '../src/facade/lang';
+
 
 import {ResponseOptions} from './base_response_options';
 import {Body} from './body';
 import {ResponseType} from './enums';
 import {Headers} from './headers';
-import {isJsObject} from './http_utils';
 
 
 /**
diff --git a/modules/@angular/http/test/backends/jsonp_backend_spec.ts b/modules/@angular/http/test/backends/jsonp_backend_spec.ts
index da07e1f62eeb..1c10960ee0d4 100644
--- a/modules/@angular/http/test/backends/jsonp_backend_spec.ts
+++ b/modules/@angular/http/test/backends/jsonp_backend_spec.ts
@@ -7,7 +7,7 @@
  */
 
 import {ReflectiveInjector} from '@angular/core';
-import {AsyncTestCompleter, SpyObject, afterEach, beforeEach, ddescribe, describe, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {AsyncTestCompleter, SpyObject, afterEach, beforeEach, describe, inject, it} from '@angular/core/testing/testing_internal';
 import {expect} from '@angular/platform-browser/testing/matchers';
 import {BrowserJsonp} from '../../src/backends/browser_jsonp';
 import {JSONPBackend, JSONPBackend_, JSONPConnection, JSONPConnection_} from '../../src/backends/jsonp_backend';
@@ -16,7 +16,6 @@ import {BaseResponseOptions, ResponseOptions} from '../../src/base_response_opti
 import {ReadyState, RequestMethod, ResponseType} from '../../src/enums';
 import {isPresent} from '../../src/facade/lang';
 import {Request} from '../../src/static_request';
-import {Response} from '../../src/static_response';
 
 var existingScripts: MockBrowserJsonp[] = [];
 
diff --git a/modules/@angular/http/test/backends/mock_backend_spec.ts b/modules/@angular/http/test/backends/mock_backend_spec.ts
index e799d52a30a5..94b122f6c11a 100644
--- a/modules/@angular/http/test/backends/mock_backend_spec.ts
+++ b/modules/@angular/http/test/backends/mock_backend_spec.ts
@@ -7,7 +7,7 @@
  */
 
 import {ReflectiveInjector} from '@angular/core';
-import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {AsyncTestCompleter, beforeEach, describe, inject, it, xit} from '@angular/core/testing/testing_internal';
 import {expect} from '@angular/platform-browser/testing/matchers';
 import {ReplaySubject} from 'rxjs/ReplaySubject';
 
diff --git a/modules/@angular/http/test/backends/xhr_backend_spec.ts b/modules/@angular/http/test/backends/xhr_backend_spec.ts
index 0b74c4b14a43..88e58691b967 100644
--- a/modules/@angular/http/test/backends/xhr_backend_spec.ts
+++ b/modules/@angular/http/test/backends/xhr_backend_spec.ts
@@ -7,7 +7,7 @@
  */
 
 import {Injectable} from '@angular/core';
-import {AsyncTestCompleter, SpyObject, afterEach, beforeEach, beforeEachProviders, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {AsyncTestCompleter, SpyObject, afterEach, beforeEach, beforeEachProviders, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
 import {__platform_browser_private__} from '@angular/platform-browser';
 
 import {BrowserXhr} from '../../src/backends/browser_xhr';
diff --git a/modules/@angular/http/test/base_request_options_spec.ts b/modules/@angular/http/test/base_request_options_spec.ts
index ef48d03e3b8c..fe47a488363d 100644
--- a/modules/@angular/http/test/base_request_options_spec.ts
+++ b/modules/@angular/http/test/base_request_options_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {describe, expect, it} from '@angular/core/testing/testing_internal';
 import {BaseRequestOptions, RequestOptions} from '../src/base_request_options';
 import {RequestMethod} from '../src/enums';
 
diff --git a/modules/@angular/http/test/headers_spec.ts b/modules/@angular/http/test/headers_spec.ts
index 91c9b8fb19b1..c31c9111f493 100644
--- a/modules/@angular/http/test/headers_spec.ts
+++ b/modules/@angular/http/test/headers_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal';
 import {Json} from '../src/facade/lang';
 import {Headers} from '../src/headers';
 
diff --git a/modules/@angular/http/test/http_spec.ts b/modules/@angular/http/test/http_spec.ts
index 3be5a2ce1d10..a0b7bbff0f85 100644
--- a/modules/@angular/http/test/http_spec.ts
+++ b/modules/@angular/http/test/http_spec.ts
@@ -8,7 +8,7 @@
 
 import {Injector, ReflectiveInjector} from '@angular/core';
 import {TestBed, getTestBed} from '@angular/core/testing';
-import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {AsyncTestCompleter, afterEach, beforeEach, describe, inject, it} from '@angular/core/testing/testing_internal';
 import {expect} from '@angular/platform-browser/testing/matchers';
 import {Observable} from 'rxjs/Observable';
 import {zip} from 'rxjs/observable/zip';
diff --git a/modules/@angular/http/test/url_search_params_spec.ts b/modules/@angular/http/test/url_search_params_spec.ts
index 237bee9a079a..f075e9536bc4 100644
--- a/modules/@angular/http/test/url_search_params_spec.ts
+++ b/modules/@angular/http/test/url_search_params_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {describe, expect, it} from '@angular/core/testing/testing_internal';
 import {URLSearchParams} from '../src/url_search_params';
 
 export function main() {
diff --git a/modules/@angular/platform-browser-dynamic/src/platform-browser-dynamic.ts b/modules/@angular/platform-browser-dynamic/src/platform-browser-dynamic.ts
index 69950907b00b..a5b089871ac8 100644
--- a/modules/@angular/platform-browser-dynamic/src/platform-browser-dynamic.ts
+++ b/modules/@angular/platform-browser-dynamic/src/platform-browser-dynamic.ts
@@ -7,10 +7,9 @@
  */
 
 import {ResourceLoader, platformCoreDynamic} from '@angular/compiler';
-import {ClassProvider, ExistingProvider, FactoryProvider, PlatformRef, Provider, TypeProvider, ValueProvider, createPlatformFactory} from '@angular/core';
+import {PlatformRef, Provider, createPlatformFactory} from '@angular/core';
 
 import {INTERNAL_BROWSER_DYNAMIC_PLATFORM_PROVIDERS} from './platform_providers';
-import {Console} from './private_import_core';
 import {CachedResourceLoader} from './resource_loader/resource_loader_cache';
 
 export * from './private_export';
diff --git a/modules/@angular/platform-browser-dynamic/src/private_export.ts b/modules/@angular/platform-browser-dynamic/src/private_export.ts
index 712b0fd73a48..039e1158007c 100644
--- a/modules/@angular/platform-browser-dynamic/src/private_export.ts
+++ b/modules/@angular/platform-browser-dynamic/src/private_export.ts
@@ -5,7 +5,7 @@
  * 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 {ClassProvider, ExistingProvider, FactoryProvider, Provider, TypeProvider, ValueProvider} from '@angular/core';
+
 import {INTERNAL_BROWSER_DYNAMIC_PLATFORM_PROVIDERS} from './platform_providers';
 import * as resource_loader from './resource_loader/resource_loader_impl';
 
diff --git a/modules/@angular/platform-browser-dynamic/test/resource_loader/resource_loader_impl_spec.ts b/modules/@angular/platform-browser-dynamic/test/resource_loader/resource_loader_impl_spec.ts
index 47d83f967c7f..672295fa15fb 100644
--- a/modules/@angular/platform-browser-dynamic/test/resource_loader/resource_loader_impl_spec.ts
+++ b/modules/@angular/platform-browser-dynamic/test/resource_loader/resource_loader_impl_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AsyncTestCompleter, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {AsyncTestCompleter, beforeEach, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
 import {ResourceLoaderImpl} from '../../src/resource_loader/resource_loader_impl';
 
 export function main() {
diff --git a/modules/@angular/platform-browser-dynamic/testing/index.ts b/modules/@angular/platform-browser-dynamic/testing/index.ts
index c4ed5f945921..0d3d0b9e5e25 100644
--- a/modules/@angular/platform-browser-dynamic/testing/index.ts
+++ b/modules/@angular/platform-browser-dynamic/testing/index.ts
@@ -7,7 +7,7 @@
  */
 
 import {platformCoreDynamicTesting} from '@angular/compiler/testing';
-import {ClassProvider, ExistingProvider, FactoryProvider, NgModule, PlatformRef, Provider, TypeProvider, ValueProvider, createPlatformFactory} from '@angular/core';
+import {NgModule, PlatformRef, Provider, createPlatformFactory} from '@angular/core';
 import {TestComponentRenderer} from '@angular/core/testing';
 import {BrowserTestingModule} from '@angular/platform-browser/testing';
 
diff --git a/modules/@angular/platform-browser/src/browser.ts b/modules/@angular/platform-browser/src/browser.ts
index b04b7367d553..acc086c79caa 100644
--- a/modules/@angular/platform-browser/src/browser.ts
+++ b/modules/@angular/platform-browser/src/browser.ts
@@ -7,7 +7,7 @@
  */
 
 import {CommonModule, PlatformLocation} from '@angular/common';
-import {ApplicationModule, ClassProvider, ErrorHandler, ExistingProvider, FactoryProvider, NgModule, Optional, PLATFORM_INITIALIZER, PlatformRef, Provider, RootRenderer, Sanitizer, SkipSelf, Testability, TypeProvider, ValueProvider, createPlatformFactory, platformCore} from '@angular/core';
+import {ApplicationModule, ErrorHandler, NgModule, Optional, PLATFORM_INITIALIZER, PlatformRef, Provider, RootRenderer, Sanitizer, SkipSelf, Testability, createPlatformFactory, platformCore} from '@angular/core';
 
 import {AnimationDriver} from '../src/dom/animation_driver';
 import {WebAnimationsDriver} from '../src/dom/web_animations_driver';
diff --git a/modules/@angular/platform-browser/src/browser/browser_adapter.ts b/modules/@angular/platform-browser/src/browser/browser_adapter.ts
index ff005f86f603..b0963ea18ba7 100644
--- a/modules/@angular/platform-browser/src/browser/browser_adapter.ts
+++ b/modules/@angular/platform-browser/src/browser/browser_adapter.ts
@@ -7,7 +7,6 @@
  */
 
 import {setRootDomAdapter} from '../dom/dom_adapter';
-import {ListWrapper} from '../facade/collection';
 import {DateWrapper, global, isBlank, isFunction, isPresent, setValueOnPath} from '../facade/lang';
 
 import {GenericBrowserDomAdapter} from './generic_browser_adapter';
diff --git a/modules/@angular/platform-browser/src/browser/location/browser_platform_location.ts b/modules/@angular/platform-browser/src/browser/location/browser_platform_location.ts
index 5766f230b89a..33c395e7229f 100644
--- a/modules/@angular/platform-browser/src/browser/location/browser_platform_location.ts
+++ b/modules/@angular/platform-browser/src/browser/location/browser_platform_location.ts
@@ -10,7 +10,6 @@ import {LocationChangeListener, PlatformLocation} from '@angular/common';
 import {Injectable} from '@angular/core';
 
 import {getDOM} from '../../dom/dom_adapter';
-import {History, Location} from '../../facade/browser';
 
 import {supportsState} from './history';
 
diff --git a/modules/@angular/platform-browser/src/browser/testability.ts b/modules/@angular/platform-browser/src/browser/testability.ts
index c397d1e1bf9a..569e937832a5 100644
--- a/modules/@angular/platform-browser/src/browser/testability.ts
+++ b/modules/@angular/platform-browser/src/browser/testability.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {GetTestability, Injectable, Testability, TestabilityRegistry, setTestabilityGetter} from '@angular/core';
+import {GetTestability, Testability, TestabilityRegistry, setTestabilityGetter} from '@angular/core';
 
 import {getDOM} from '../dom/dom_adapter';
 import {ListWrapper} from '../facade/collection';
diff --git a/modules/@angular/platform-browser/src/dom/dom_renderer.ts b/modules/@angular/platform-browser/src/dom/dom_renderer.ts
index 16df417a4d04..fed8d631ccd0 100644
--- a/modules/@angular/platform-browser/src/dom/dom_renderer.ts
+++ b/modules/@angular/platform-browser/src/dom/dom_renderer.ts
@@ -6,9 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Inject, Injectable, OpaqueToken, RenderComponentType, Renderer, RootRenderer, ViewEncapsulation} from '@angular/core';
-
-import {StringMapWrapper} from '../facade/collection';
+import {Inject, Injectable, RenderComponentType, Renderer, RootRenderer, ViewEncapsulation} from '@angular/core';
 import {Json, StringWrapper, isArray, isBlank, isPresent, isString, stringify} from '../facade/lang';
 import {AnimationKeyframe, AnimationPlayer, AnimationStyles, RenderDebugInfo} from '../private_import_core';
 
diff --git a/modules/@angular/platform-browser/src/dom/web_animations_driver.ts b/modules/@angular/platform-browser/src/dom/web_animations_driver.ts
index c17851f55ed6..49653106bf38 100644
--- a/modules/@angular/platform-browser/src/dom/web_animations_driver.ts
+++ b/modules/@angular/platform-browser/src/dom/web_animations_driver.ts
@@ -10,10 +10,9 @@ import {AUTO_STYLE} from '@angular/core';
 
 import {StringMapWrapper} from '../facade/collection';
 import {StringWrapper, isNumber, isPresent} from '../facade/lang';
-import {AnimationKeyframe, AnimationPlayer, AnimationStyles, NoOpAnimationPlayer} from '../private_import_core';
+import {AnimationKeyframe, AnimationStyles} from '../private_import_core';
 
 import {AnimationDriver} from './animation_driver';
-import {DomAnimatePlayer} from './dom_animate_player';
 import {dashCaseToCamelCase} from './util';
 import {WebAnimationsPlayer} from './web_animations_player';
 
diff --git a/modules/@angular/platform-browser/src/private_export.ts b/modules/@angular/platform-browser/src/private_export.ts
index f555fbad7ab4..3738f46e88f4 100644
--- a/modules/@angular/platform-browser/src/private_export.ts
+++ b/modules/@angular/platform-browser/src/private_export.ts
@@ -5,7 +5,7 @@
  * 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 {ClassProvider, ExistingProvider, FactoryProvider, Provider, TypeProvider, ValueProvider} from '@angular/core';
+
 
 import * as browser from './browser';
 import * as browserDomAdapter from './browser/browser_adapter';
diff --git a/modules/@angular/platform-browser/test/browser/bootstrap_spec.ts b/modules/@angular/platform-browser/test/browser/bootstrap_spec.ts
index 658ce665e3cc..aa4e90aa7b19 100644
--- a/modules/@angular/platform-browser/test/browser/bootstrap_spec.ts
+++ b/modules/@angular/platform-browser/test/browser/bootstrap_spec.ts
@@ -11,7 +11,7 @@ import {ApplicationRef, destroyPlatform} from '@angular/core/src/application_ref
 import {Console} from '@angular/core/src/console';
 import {ComponentRef} from '@angular/core/src/linker/component_factory';
 import {Testability, TestabilityRegistry} from '@angular/core/src/testability/testability';
-import {AsyncTestCompleter, Log, afterEach, beforeEach, beforeEachProviders, ddescribe, describe, iit, inject, it} from '@angular/core/testing/testing_internal';
+import {AsyncTestCompleter, Log, afterEach, beforeEach, beforeEachProviders, describe, inject, it} from '@angular/core/testing/testing_internal';
 import {BrowserModule} from '@angular/platform-browser';
 import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
 import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
diff --git a/modules/@angular/platform-browser/test/browser/browser_adapter_spec.ts b/modules/@angular/platform-browser/test/browser/browser_adapter_spec.ts
index e866c45f2807..9492721a0371 100644
--- a/modules/@angular/platform-browser/test/browser/browser_adapter_spec.ts
+++ b/modules/@angular/platform-browser/test/browser/browser_adapter_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it} from '@angular/core/testing/testing_internal';
+import {describe, expect, it} from '@angular/core/testing/testing_internal';
 import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
 
 import {parseCookieValue} from '../../src/browser/browser_adapter';
diff --git a/modules/@angular/platform-browser/test/browser/tools/tools_spec.ts b/modules/@angular/platform-browser/test/browser/tools/tools_spec.ts
index 55ef9947e4d1..5aa570822c19 100644
--- a/modules/@angular/platform-browser/test/browser/tools/tools_spec.ts
+++ b/modules/@angular/platform-browser/test/browser/tools/tools_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {afterEach, beforeEach, describe, it} from '@angular/core/testing/testing_internal';
 import {disableDebugTools, enableDebugTools} from '@angular/platform-browser';
 
 import {SpyComponentRef, callNgProfilerTimeChangeDetection} from './spies';
diff --git a/modules/@angular/platform-browser/test/dom/dom_renderer_integration_spec.ts b/modules/@angular/platform-browser/test/dom/dom_renderer_integration_spec.ts
index b326f798beeb..3598b5230d1e 100644
--- a/modules/@angular/platform-browser/test/dom/dom_renderer_integration_spec.ts
+++ b/modules/@angular/platform-browser/test/dom/dom_renderer_integration_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {describe, it} from '@angular/core/testing/testing_internal';
 
 // import {MapWrapper} from '../../src/facade/src/collection';
 // import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
diff --git a/modules/@angular/platform-browser/test/dom/events/event_manager_spec.ts b/modules/@angular/platform-browser/test/dom/events/event_manager_spec.ts
index 3e8cac85dce1..b988a757bacc 100644
--- a/modules/@angular/platform-browser/test/dom/events/event_manager_spec.ts
+++ b/modules/@angular/platform-browser/test/dom/events/event_manager_spec.ts
@@ -7,7 +7,7 @@
  */
 
 import {NgZone} from '@angular/core/src/zone/ng_zone';
-import {beforeEach, ddescribe, describe, expect, iit, it, xdescribe, xit} from '@angular/core/testing/testing_internal';
+import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal';
 import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
 import {DomEventsPlugin} from '@angular/platform-browser/src/dom/events/dom_events';
 import {EventManager, EventManagerPlugin} from '@angular/platform-browser/src/dom/events/event_manager';
diff --git a/modules/@angular/platform-browser/test/dom/events/key_events_spec.ts b/modules/@angular/platform-browser/test/dom/events/key_events_spec.ts
index ecf3039acc86..d308a2c6ad3a 100644
--- a/modules/@angular/platform-browser/test/dom/events/key_events_spec.ts
+++ b/modules/@angular/platform-browser/test/dom/events/key_events_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {beforeEach, ddescribe, describe, expect, iit, it, xdescribe, xit} from '@angular/core/testing/testing_internal';
+import {describe, expect, it} from '@angular/core/testing/testing_internal';
 import {KeyEventsPlugin} from '@angular/platform-browser/src/dom/events/key_events';
 
 export function main() {
diff --git a/modules/@angular/platform-browser/test/dom/shared_styles_host_spec.ts b/modules/@angular/platform-browser/test/dom/shared_styles_host_spec.ts
index 7d9d9cc1bb27..7650bc694edb 100644
--- a/modules/@angular/platform-browser/test/dom/shared_styles_host_spec.ts
+++ b/modules/@angular/platform-browser/test/dom/shared_styles_host_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {beforeEach, beforeEachProviders, ddescribe, describe, iit, inject, it, xdescribe, xit} from '@angular/core/testing/testing_internal';
+import {beforeEach, describe, it} from '@angular/core/testing/testing_internal';
 import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
 import {DomSharedStylesHost} from '@angular/platform-browser/src/dom/shared_styles_host';
 import {expect} from '@angular/platform-browser/testing/matchers';
diff --git a/modules/@angular/platform-browser/test/dom/web_animations_driver_spec.ts b/modules/@angular/platform-browser/test/dom/web_animations_driver_spec.ts
index 443159864931..e455bc11daf9 100644
--- a/modules/@angular/platform-browser/test/dom/web_animations_driver_spec.ts
+++ b/modules/@angular/platform-browser/test/dom/web_animations_driver_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {beforeEach, beforeEachProviders, ddescribe, describe, expect, iit, inject, it, xdescribe, xit} from '@angular/core/testing/testing_internal';
+import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal';
 import {el} from '@angular/platform-browser/testing/browser_util';
 
 import {DomAnimatePlayer} from '../../src/dom/dom_animate_player';
diff --git a/modules/@angular/platform-browser/test/dom/web_animations_player_spec.ts b/modules/@angular/platform-browser/test/dom/web_animations_player_spec.ts
index 5a98a46b7d1a..c89c1622cb25 100644
--- a/modules/@angular/platform-browser/test/dom/web_animations_player_spec.ts
+++ b/modules/@angular/platform-browser/test/dom/web_animations_player_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AsyncTestCompleter, MockAnimationPlayer, beforeEach, beforeEachProviders, ddescribe, describe, expect, iit, inject, it, xdescribe, xit} from '@angular/core/testing/testing_internal';
+import {MockAnimationPlayer, beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal';
 import {el} from '@angular/platform-browser/testing/browser_util';
 
 import {DomAnimatePlayer} from '../../src/dom/dom_animate_player';
diff --git a/modules/@angular/platform-browser/testing/browser.ts b/modules/@angular/platform-browser/testing/browser.ts
index d173a33efbd8..758eb2748ab1 100644
--- a/modules/@angular/platform-browser/testing/browser.ts
+++ b/modules/@angular/platform-browser/testing/browser.ts
@@ -5,7 +5,7 @@
  * 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 {APP_ID, ClassProvider, ExistingProvider, FactoryProvider, NgModule, NgZone, PLATFORM_INITIALIZER, PlatformRef, Provider, TypeProvider, ValueProvider, createPlatformFactory, platformCore} from '@angular/core';
+import {APP_ID, NgModule, NgZone, PLATFORM_INITIALIZER, PlatformRef, Provider, createPlatformFactory, platformCore} from '@angular/core';
 import {AnimationDriver, BrowserModule} from '@angular/platform-browser';
 
 import {BrowserDetection, createNgZone} from './browser_util';
diff --git a/modules/@angular/platform-browser/testing/browser_util.ts b/modules/@angular/platform-browser/testing/browser_util.ts
index 04651f5aff73..d1473469808c 100644
--- a/modules/@angular/platform-browser/testing/browser_util.ts
+++ b/modules/@angular/platform-browser/testing/browser_util.ts
@@ -9,7 +9,7 @@
 import {NgZone} from '@angular/core';
 
 import {ListWrapper} from './facade/collection';
-import {RegExp, StringWrapper, global, isPresent, isString} from './facade/lang';
+import {StringWrapper, global, isPresent, isString} from './facade/lang';
 import {getDOM} from './private_import_platform-browser';
 
 export class BrowserDetection {
diff --git a/modules/@angular/platform-server/src/private_export.ts b/modules/@angular/platform-server/src/private_export.ts
index 30c91b0601bb..497ea8d2705b 100644
--- a/modules/@angular/platform-server/src/private_export.ts
+++ b/modules/@angular/platform-server/src/private_export.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ClassProvider, ExistingProvider, FactoryProvider, Provider, TypeProvider, ValueProvider} from '@angular/core';
+
 import {INTERNAL_SERVER_PLATFORM_PROVIDERS} from './server';
 
 export var __platform_server_private__:
diff --git a/modules/@angular/platform-server/src/server.ts b/modules/@angular/platform-server/src/server.ts
index e351ad5c7038..b909eefb5ec0 100644
--- a/modules/@angular/platform-server/src/server.ts
+++ b/modules/@angular/platform-server/src/server.ts
@@ -8,7 +8,7 @@
 
 import {PlatformLocation} from '@angular/common';
 import {platformCoreDynamic} from '@angular/compiler';
-import {ClassProvider, ExistingProvider, FactoryProvider, NgModule, PLATFORM_INITIALIZER, PlatformRef, Provider, TypeProvider, ValueProvider, createPlatformFactory, platformCore} from '@angular/core';
+import {NgModule, PLATFORM_INITIALIZER, PlatformRef, Provider, createPlatformFactory, platformCore} from '@angular/core';
 import {BrowserModule} from '@angular/platform-browser';
 
 import {Parse5DomAdapter} from './parse5_adapter';
diff --git a/modules/@angular/platform-server/testing/server.ts b/modules/@angular/platform-server/testing/server.ts
index e76728c3dfb1..c52a4220c260 100644
--- a/modules/@angular/platform-server/testing/server.ts
+++ b/modules/@angular/platform-server/testing/server.ts
@@ -7,7 +7,7 @@
  */
 
 import {platformCoreDynamicTesting} from '@angular/compiler/testing';
-import {ClassProvider, ExistingProvider, FactoryProvider, NgModule, PlatformRef, Provider, TypeProvider, ValueProvider, createPlatformFactory} from '@angular/core';
+import {NgModule, PlatformRef, Provider, createPlatformFactory} from '@angular/core';
 import {BrowserDynamicTestingModule} from '@angular/platform-browser-dynamic/testing';
 import {INTERNAL_SERVER_PLATFORM_PROVIDERS} from './private_import_platform_server';
 
diff --git a/modules/@angular/platform-webworker-dynamic/src/platform-webworker-dynamic.ts b/modules/@angular/platform-webworker-dynamic/src/platform-webworker-dynamic.ts
index d7cecba930a6..36793a0accb9 100644
--- a/modules/@angular/platform-webworker-dynamic/src/platform-webworker-dynamic.ts
+++ b/modules/@angular/platform-webworker-dynamic/src/platform-webworker-dynamic.ts
@@ -7,7 +7,7 @@
  */
 
 import {ResourceLoader, platformCoreDynamic} from '@angular/compiler';
-import {COMPILER_OPTIONS, ClassProvider, ExistingProvider, FactoryProvider, PlatformRef, Provider, TypeProvider, ValueProvider, createPlatformFactory} from '@angular/core';
+import {COMPILER_OPTIONS, PlatformRef, Provider, createPlatformFactory} from '@angular/core';
 import {ResourceLoaderImpl} from './private_import_platform-browser-dynamic';
 
 
diff --git a/modules/@angular/platform-webworker/src/worker_app.ts b/modules/@angular/platform-webworker/src/worker_app.ts
index 76d678852796..03fef5afab8e 100644
--- a/modules/@angular/platform-webworker/src/worker_app.ts
+++ b/modules/@angular/platform-webworker/src/worker_app.ts
@@ -7,7 +7,7 @@
  */
 
 import {CommonModule} from '@angular/common';
-import {APP_INITIALIZER, ApplicationModule, ClassProvider, ErrorHandler, ExistingProvider, FactoryProvider, NgModule, NgZone, PlatformRef, Provider, RootRenderer, TypeProvider, ValueProvider, createPlatformFactory, platformCore} from '@angular/core';
+import {APP_INITIALIZER, ApplicationModule, ErrorHandler, NgModule, NgZone, PlatformRef, Provider, RootRenderer, createPlatformFactory, platformCore} from '@angular/core';
 
 import {BROWSER_SANITIZATION_PROVIDERS} from './private_import_platform-browser';
 import {ON_WEB_WORKER} from './web_workers/shared/api';
diff --git a/modules/@angular/platform-webworker/src/worker_render.ts b/modules/@angular/platform-webworker/src/worker_render.ts
index f1bd38877a28..a3e7117f9644 100644
--- a/modules/@angular/platform-webworker/src/worker_render.ts
+++ b/modules/@angular/platform-webworker/src/worker_render.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ClassProvider, ErrorHandler, ExistingProvider, FactoryProvider, Injectable, Injector, NgZone, OpaqueToken, PLATFORM_INITIALIZER, PlatformRef, Provider, RootRenderer, Testability, TypeProvider, ValueProvider, createPlatformFactory, isDevMode, platformCore} from '@angular/core';
+import {ErrorHandler, Injectable, Injector, NgZone, OpaqueToken, PLATFORM_INITIALIZER, PlatformRef, Provider, RootRenderer, Testability, createPlatformFactory, isDevMode, platformCore} from '@angular/core';
 import {AnimationDriver, DOCUMENT, EVENT_MANAGER_PLUGINS, EventManager, HAMMER_GESTURE_CONFIG, HammerGestureConfig} from '@angular/platform-browser';
 
 import {BROWSER_SANITIZATION_PROVIDERS, BrowserDomAdapter, BrowserGetTestability, DomEventsPlugin, DomRootRenderer, DomRootRenderer_, DomSharedStylesHost, HammerGesturesPlugin, KeyEventsPlugin, SharedStylesHost, getDOM} from './private_import_platform-browser';
diff --git a/modules/@angular/platform-webworker/test/web_workers/shared/message_bus_spec.ts b/modules/@angular/platform-webworker/test/web_workers/shared/message_bus_spec.ts
index 3e014d196ded..67b3a74710bf 100644
--- a/modules/@angular/platform-webworker/test/web_workers/shared/message_bus_spec.ts
+++ b/modules/@angular/platform-webworker/test/web_workers/shared/message_bus_spec.ts
@@ -8,7 +8,7 @@
 
 import {NgZone} from '@angular/core';
 import {withModule} from '@angular/core/testing/test_bed';
-import {AsyncTestCompleter, MockNgZone, beforeEach, beforeEachProviders, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
+import {AsyncTestCompleter, MockNgZone, beforeEach, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
 import {MessageBus} from '@angular/platform-webworker/src/web_workers/shared/message_bus';
 
 import {createConnectedMessageBus} from './message_bus_util';
diff --git a/modules/@angular/platform-webworker/test/web_workers/shared/service_message_broker_spec.ts b/modules/@angular/platform-webworker/test/web_workers/shared/service_message_broker_spec.ts
index 1af16296696a..9580c8472abd 100644
--- a/modules/@angular/platform-webworker/test/web_workers/shared/service_message_broker_spec.ts
+++ b/modules/@angular/platform-webworker/test/web_workers/shared/service_message_broker_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {beforeEach, beforeEachProviders, describe, expect, iit, inject, it} from '@angular/core/testing/testing_internal';
+import {beforeEach, beforeEachProviders, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
 import {ON_WEB_WORKER} from '@angular/platform-webworker/src/web_workers/shared/api';
 import {RenderStore} from '@angular/platform-webworker/src/web_workers/shared/render_store';
 import {PRIMITIVE, Serializer} from '@angular/platform-webworker/src/web_workers/shared/serializer';
diff --git a/modules/@angular/platform-webworker/test/web_workers/shared/web_worker_test_util.ts b/modules/@angular/platform-webworker/test/web_workers/shared/web_worker_test_util.ts
index fb6e5ef72de1..2379c42ee55c 100644
--- a/modules/@angular/platform-webworker/test/web_workers/shared/web_worker_test_util.ts
+++ b/modules/@angular/platform-webworker/test/web_workers/shared/web_worker_test_util.ts
@@ -10,7 +10,6 @@ import {Type} from '@angular/core';
 import {NgZone} from '@angular/core/src/zone/ng_zone';
 import {ClientMessageBroker, ClientMessageBrokerFactory_, UiArguments} from '@angular/platform-webworker/src/web_workers/shared/client_message_broker';
 import {MessageBus, MessageBusSink, MessageBusSource} from '@angular/platform-webworker/src/web_workers/shared/message_bus';
-import {ListWrapper, StringMapWrapper} from '../../../src/facade/collection';
 import {isPresent} from '../../../src/facade/lang';
 import {SpyMessageBroker} from '../worker/spies';
 
diff --git a/modules/@angular/platform-webworker/test/web_workers/worker/platform_location_spec.ts b/modules/@angular/platform-webworker/test/web_workers/worker/platform_location_spec.ts
index 2c2376b3f758..4b0656489531 100644
--- a/modules/@angular/platform-webworker/test/web_workers/worker/platform_location_spec.ts
+++ b/modules/@angular/platform-webworker/test/web_workers/worker/platform_location_spec.ts
@@ -7,7 +7,7 @@
  */
 
 import {Type} from '@angular/core';
-import {AsyncTestCompleter, beforeEach, beforeEachProviders, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
+import {AsyncTestCompleter, beforeEach, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
 import {UiArguments} from '@angular/platform-webworker/src/web_workers/shared/client_message_broker';
 import {MessageBus} from '@angular/platform-webworker/src/web_workers/shared/message_bus';
 import {LocationType} from '@angular/platform-webworker/src/web_workers/shared/serialized_types';
diff --git a/modules/@angular/platform-webworker/test/web_workers/worker/spies.ts b/modules/@angular/platform-webworker/test/web_workers/worker/spies.ts
index 22d498f13adb..7055f6651044 100644
--- a/modules/@angular/platform-webworker/test/web_workers/worker/spies.ts
+++ b/modules/@angular/platform-webworker/test/web_workers/worker/spies.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {SpyObject, proxy} from '@angular/core/testing/testing_internal';
+import {SpyObject} from '@angular/core/testing/testing_internal';
 import {ClientMessageBroker} from '@angular/platform-webworker/src/web_workers/shared/client_message_broker';
 
 export class SpyMessageBroker extends SpyObject {
diff --git a/modules/@angular/router/src/directives/router_link_active.ts b/modules/@angular/router/src/directives/router_link_active.ts
index 5eb4c1198a3c..e41c259f4da3 100644
--- a/modules/@angular/router/src/directives/router_link_active.ts
+++ b/modules/@angular/router/src/directives/router_link_active.ts
@@ -10,7 +10,6 @@ import {AfterContentInit, ContentChildren, Directive, ElementRef, Input, OnChang
 import {Subscription} from 'rxjs/Subscription';
 
 import {NavigationEnd, Router} from '../router';
-import {UrlTree} from '../url_tree';
 
 import {RouterLink, RouterLinkWithHref} from './router_link';
 
diff --git a/modules/@angular/router/src/private_export.ts b/modules/@angular/router/src/private_export.ts
index 1ecd87a9276a..dfe3a0582ec2 100644
--- a/modules/@angular/router/src/private_export.ts
+++ b/modules/@angular/router/src/private_export.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ClassProvider, ExistingProvider, FactoryProvider, OpaqueToken, Provider, TypeProvider, ValueProvider} from '@angular/core';
+
 
 import {ROUTES} from './router_config_loader';
 import {ROUTER_PROVIDERS} from './router_module';
diff --git a/modules/@angular/router/src/router_state.ts b/modules/@angular/router/src/router_state.ts
index 94a4f1338cb3..9aa4e4e8bc64 100644
--- a/modules/@angular/router/src/router_state.ts
+++ b/modules/@angular/router/src/router_state.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ComponentFactory, Type} from '@angular/core';
+import {Type} from '@angular/core';
 import {BehaviorSubject} from 'rxjs/BehaviorSubject';
 import {Observable} from 'rxjs/Observable';
 
diff --git a/modules/@angular/router/test/create_router_state.spec.ts b/modules/@angular/router/test/create_router_state.spec.ts
index 8b1a448801ab..9ef739f9f71a 100644
--- a/modules/@angular/router/test/create_router_state.spec.ts
+++ b/modules/@angular/router/test/create_router_state.spec.ts
@@ -10,7 +10,7 @@ import {Routes} from '../src/config';
 import {createRouterState} from '../src/create_router_state';
 import {recognize} from '../src/recognize';
 import {ActivatedRoute, RouterState, RouterStateSnapshot, advanceActivatedRoute, createEmptyState} from '../src/router_state';
-import {PRIMARY_OUTLET, Params} from '../src/shared';
+import {PRIMARY_OUTLET} from '../src/shared';
 import {DefaultUrlSerializer, UrlSegmentGroup, UrlTree} from '../src/url_tree';
 import {TreeNode} from '../src/utils/tree';
 
diff --git a/modules/@angular/router/test/create_url_tree.spec.ts b/modules/@angular/router/test/create_url_tree.spec.ts
index dbe69ceaaba2..7482c6ec45f7 100644
--- a/modules/@angular/router/test/create_url_tree.spec.ts
+++ b/modules/@angular/router/test/create_url_tree.spec.ts
@@ -11,7 +11,7 @@ import {BehaviorSubject} from 'rxjs/BehaviorSubject';
 import {createUrlTree} from '../src/create_url_tree';
 import {ActivatedRoute, ActivatedRouteSnapshot, advanceActivatedRoute} from '../src/router_state';
 import {PRIMARY_OUTLET, Params} from '../src/shared';
-import {DefaultUrlSerializer, UrlSegment, UrlSegmentGroup, UrlTree} from '../src/url_tree';
+import {DefaultUrlSerializer, UrlSegmentGroup, UrlTree} from '../src/url_tree';
 
 describe('createUrlTree', () => {
   const serializer = new DefaultUrlSerializer();
diff --git a/modules/@angular/router/test/url_serializer.spec.ts b/modules/@angular/router/test/url_serializer.spec.ts
index 463b3c43dabb..3cfdc6de2b50 100644
--- a/modules/@angular/router/test/url_serializer.spec.ts
+++ b/modules/@angular/router/test/url_serializer.spec.ts
@@ -7,7 +7,7 @@
  */
 
 import {PRIMARY_OUTLET} from '../src/shared';
-import {DefaultUrlSerializer, UrlSegmentGroup, decode, encode, serializePath} from '../src/url_tree';
+import {DefaultUrlSerializer, UrlSegmentGroup, encode, serializePath} from '../src/url_tree';
 
 describe('url serializer', () => {
   const url = new DefaultUrlSerializer();
diff --git a/modules/@angular/router/test/url_tree.spec.ts b/modules/@angular/router/test/url_tree.spec.ts
index 821e126a5dd8..99322d8a4e85 100644
--- a/modules/@angular/router/test/url_tree.spec.ts
+++ b/modules/@angular/router/test/url_tree.spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {DefaultUrlSerializer, UrlTree, containsTree} from '../src/url_tree';
+import {DefaultUrlSerializer, containsTree} from '../src/url_tree';
 
 describe('UrlTree', () => {
   const serializer = new DefaultUrlSerializer();
diff --git a/modules/@angular/upgrade/src/upgrade_adapter.ts b/modules/@angular/upgrade/src/upgrade_adapter.ts
index 72a3afe68b2c..5abc226c5953 100644
--- a/modules/@angular/upgrade/src/upgrade_adapter.ts
+++ b/modules/@angular/upgrade/src/upgrade_adapter.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Compiler, ComponentFactory, ComponentFactoryResolver, Injector, NgModule, NgModuleRef, NgZone, Provider, Testability, Type} from '@angular/core';
+import {Compiler, ComponentFactory, Injector, NgModule, NgModuleRef, NgZone, Provider, Testability, Type} from '@angular/core';
 import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
 
 import * as angular from './angular_js';
diff --git a/modules/@angular/upgrade/test/metadata_spec.ts b/modules/@angular/upgrade/test/metadata_spec.ts
index 61d859ef1fa1..07f1da5063f4 100644
--- a/modules/@angular/upgrade/test/metadata_spec.ts
+++ b/modules/@angular/upgrade/test/metadata_spec.ts
@@ -6,8 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Component, Type} from '@angular/core';
-import {beforeEach, ddescribe, describe, expect, iit, inject, it, xdescribe, xit} from '@angular/core/testing/testing_internal';
+import {Component} from '@angular/core';
+import {describe, expect, it} from '@angular/core/testing/testing_internal';
 import {getComponentInfo, parseFields} from '@angular/upgrade/src/metadata';
 
 export function main() {
diff --git a/modules/@angular/upgrade/test/upgrade_spec.ts b/modules/@angular/upgrade/test/upgrade_spec.ts
index 8aaf51a6fd04..f32afed0023d 100644
--- a/modules/@angular/upgrade/test/upgrade_spec.ts
+++ b/modules/@angular/upgrade/test/upgrade_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Class, Component, EventEmitter, Inject, NO_ERRORS_SCHEMA, NgModule, OpaqueToken, Testability, destroyPlatform, forwardRef} from '@angular/core';
+import {Class, Component, EventEmitter, NO_ERRORS_SCHEMA, NgModule, Testability, destroyPlatform, forwardRef} from '@angular/core';
 import {async} from '@angular/core/testing';
 import {BrowserModule} from '@angular/platform-browser';
 import {UpgradeAdapter} from '@angular/upgrade';
diff --git a/modules/benchmarks/src/largetable/ng2/index.ts b/modules/benchmarks/src/largetable/ng2/index.ts
index 0d23ca369c8b..2376daa97632 100644
--- a/modules/benchmarks/src/largetable/ng2/index.ts
+++ b/modules/benchmarks/src/largetable/ng2/index.ts
@@ -1,4 +1,4 @@
-import {ApplicationRef, NgModule, enableProdMode} from '@angular/core';
+import {ApplicationRef, enableProdMode} from '@angular/core';
 import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
 
 import {bindAction, profile} from '../../util';
diff --git a/modules/benchmarks/src/largetable/ng2_switch/index.ts b/modules/benchmarks/src/largetable/ng2_switch/index.ts
index 0d23ca369c8b..2376daa97632 100644
--- a/modules/benchmarks/src/largetable/ng2_switch/index.ts
+++ b/modules/benchmarks/src/largetable/ng2_switch/index.ts
@@ -1,4 +1,4 @@
-import {ApplicationRef, NgModule, enableProdMode} from '@angular/core';
+import {ApplicationRef, enableProdMode} from '@angular/core';
 import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
 
 import {bindAction, profile} from '../../util';
diff --git a/modules/benchmarks/src/tree/baseline/index.ts b/modules/benchmarks/src/tree/baseline/index.ts
index 58a3927cf1ca..045e5018c254 100644
--- a/modules/benchmarks/src/tree/baseline/index.ts
+++ b/modules/benchmarks/src/tree/baseline/index.ts
@@ -1,5 +1,5 @@
 import {bindAction, profile} from '../../util';
-import {TreeNode, buildTree, emptyTree} from '../util';
+import {buildTree, emptyTree} from '../util';
 import {TreeComponent} from './tree';
 
 export function main() {
diff --git a/modules/benchmarks/src/tree/incremental_dom/index.ts b/modules/benchmarks/src/tree/incremental_dom/index.ts
index 70ffe285e37c..eb2e17827d73 100644
--- a/modules/benchmarks/src/tree/incremental_dom/index.ts
+++ b/modules/benchmarks/src/tree/incremental_dom/index.ts
@@ -1,5 +1,5 @@
 import {bindAction, profile} from '../../util';
-import {TreeNode, buildTree, emptyTree} from '../util';
+import {buildTree, emptyTree} from '../util';
 import {TreeComponent} from './tree';
 const {patch} = require('incremental-dom');
 
diff --git a/modules/benchmarks/src/tree/ng2/index.ts b/modules/benchmarks/src/tree/ng2/index.ts
index 68ae9d6cb583..7c8c66b4416d 100644
--- a/modules/benchmarks/src/tree/ng2/index.ts
+++ b/modules/benchmarks/src/tree/ng2/index.ts
@@ -1,8 +1,8 @@
-import {ApplicationRef, NgModule, enableProdMode} from '@angular/core';
+import {ApplicationRef, enableProdMode} from '@angular/core';
 import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
 
 import {bindAction, profile} from '../../util';
-import {TreeNode, buildTree, emptyTree} from '../util';
+import {buildTree, emptyTree} from '../util';
 
 import {AppModule, TreeComponent} from './tree';
 
diff --git a/modules/benchmarks/src/tree/ng2_static/index.ts b/modules/benchmarks/src/tree/ng2_static/index.ts
index 2a21d6871076..d4e8b3c4f65c 100644
--- a/modules/benchmarks/src/tree/ng2_static/index.ts
+++ b/modules/benchmarks/src/tree/ng2_static/index.ts
@@ -1,8 +1,8 @@
-import {ApplicationRef, NgModule, enableProdMode} from '@angular/core';
+import {ApplicationRef, enableProdMode} from '@angular/core';
 import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
 
 import {bindAction, profile} from '../../util';
-import {TreeNode, buildTree, emptyTree} from '../util';
+import {buildTree, emptyTree} from '../util';
 
 import {AppModule, RootTreeComponent} from './tree';
 
diff --git a/modules/benchmarks/src/tree/ng2_switch/index.ts b/modules/benchmarks/src/tree/ng2_switch/index.ts
index e8bfd286f232..dd38964858ba 100644
--- a/modules/benchmarks/src/tree/ng2_switch/index.ts
+++ b/modules/benchmarks/src/tree/ng2_switch/index.ts
@@ -1,8 +1,8 @@
-import {ApplicationRef, NgModule, enableProdMode} from '@angular/core';
+import {ApplicationRef, enableProdMode} from '@angular/core';
 import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
 
 import {bindAction, profile} from '../../util';
-import {TreeNode, buildTree, emptyTree} from '../util';
+import {buildTree, emptyTree} from '../util';
 
 import {AppModule, TreeComponent} from './tree';
 
diff --git a/modules/benchmarks/src/tree/ng2_switch/tree.ts b/modules/benchmarks/src/tree/ng2_switch/tree.ts
index eab1a7dc4698..8e8ca394daa3 100644
--- a/modules/benchmarks/src/tree/ng2_switch/tree.ts
+++ b/modules/benchmarks/src/tree/ng2_switch/tree.ts
@@ -1,7 +1,7 @@
 import {Component, Input, NgModule} from '@angular/core';
 import {BrowserModule} from '@angular/platform-browser';
 
-import {TreeNode, emptyTree, flattenTree} from '../util';
+import {TreeNode, emptyTree} from '../util';
 
 @Component({
   selector: 'tree',
diff --git a/modules/benchmarks/src/tree/polymer_leaves/index.ts b/modules/benchmarks/src/tree/polymer_leaves/index.ts
index 2a145134de81..90600b387fa3 100644
--- a/modules/benchmarks/src/tree/polymer_leaves/index.ts
+++ b/modules/benchmarks/src/tree/polymer_leaves/index.ts
@@ -1,5 +1,5 @@
 import {bindAction} from '../../util';
-import {TreeNode, buildTree, emptyTree, flattenTree} from '../util';
+import {buildTree, flattenTree} from '../util';
 
 declare var Polymer: any;
 
diff --git a/modules/playground/e2e_test/sourcemap/sourcemap_spec.ts b/modules/playground/e2e_test/sourcemap/sourcemap_spec.ts
index 8e36a24635b1..f86592458d6c 100644
--- a/modules/playground/e2e_test/sourcemap/sourcemap_spec.ts
+++ b/modules/playground/e2e_test/sourcemap/sourcemap_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import * as testUtil from 'e2e_util/e2e_util';
+
 
 var fs = require('fs');
 var sourceMap = require('source-map');
diff --git a/modules/playground/src/animate/app/animate-app.ts b/modules/playground/src/animate/app/animate-app.ts
index 52a2d1e18661..b3a337b368c1 100644
--- a/modules/playground/src/animate/app/animate-app.ts
+++ b/modules/playground/src/animate/app/animate-app.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Component, animate, group, keyframes, sequence, state, style, transition, trigger} from '@angular/core';
+import {Component, animate, keyframes, state, style, transition, trigger} from '@angular/core';
 
 @Component({
   host: {
diff --git a/modules/playground/src/animate/index.ts b/modules/playground/src/animate/index.ts
index 2922c3a8ec7f..8a6d93f4481a 100644
--- a/modules/playground/src/animate/index.ts
+++ b/modules/playground/src/animate/index.ts
@@ -5,7 +5,7 @@
  * 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 {Component, NgModule} from '@angular/core';
+import {NgModule} from '@angular/core';
 import {BrowserModule} from '@angular/platform-browser';
 import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
 
diff --git a/modules/playground/src/model_driven_forms/index.ts b/modules/playground/src/model_driven_forms/index.ts
index 630f7ae61b9c..d71abcc8062d 100644
--- a/modules/playground/src/model_driven_forms/index.ts
+++ b/modules/playground/src/model_driven_forms/index.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Component, Directive, Host, NgModule} from '@angular/core';
+import {Component, Host, NgModule} from '@angular/core';
 import {isPresent, print} from '@angular/core/src/facade/lang';
 import {AbstractControl, FormBuilder, FormGroup, FormGroupDirective, ReactiveFormsModule, Validators} from '@angular/forms';
 import {BrowserModule} from '@angular/platform-browser';
diff --git a/modules/playground/src/routing/app/inbox-app.ts b/modules/playground/src/routing/app/inbox-app.ts
index 18e7806e26de..e756397cf49e 100644
--- a/modules/playground/src/routing/app/inbox-app.ts
+++ b/modules/playground/src/routing/app/inbox-app.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Location} from '@angular/common';
+
 import {Component, Injectable} from '@angular/core';
 import {DateWrapper, isPresent} from '@angular/core/src/facade/lang';
 import {ActivatedRoute, Router} from '@angular/router';
diff --git a/modules/playground/src/template_driven_forms/index.ts b/modules/playground/src/template_driven_forms/index.ts
index 72d35f1d3dfe..e736e7f9fb14 100644
--- a/modules/playground/src/template_driven_forms/index.ts
+++ b/modules/playground/src/template_driven_forms/index.ts
@@ -6,10 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgFor, NgIf} from '@angular/common';
+
 import {Component, Directive, Host, NgModule} from '@angular/core';
 import {isPresent, print} from '@angular/core/src/facade/lang';
-import {FormGroup, FormsModule, NG_VALIDATORS, NgControl, NgForm, Validators} from '@angular/forms';
+import {FormGroup, FormsModule, NG_VALIDATORS, NgForm} from '@angular/forms';
 import {BrowserModule} from '@angular/platform-browser';
 import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
 
diff --git a/modules/playground/src/web_workers/images/index_common.ts b/modules/playground/src/web_workers/images/index_common.ts
index 0689f694ba2c..92dc2374e39f 100644
--- a/modules/playground/src/web_workers/images/index_common.ts
+++ b/modules/playground/src/web_workers/images/index_common.ts
@@ -7,7 +7,6 @@
  */
 
 import {Component} from '@angular/core';
-import {EventListener} from '@angular/core/src/facade/browser';
 
 import {FileReader, Uint8ArrayWrapper} from './file_api';
 import {BitmapService} from './services/bitmap';
diff --git a/modules/playground/src/web_workers/images/single_thread.ts b/modules/playground/src/web_workers/images/single_thread.ts
index e4854a6ebb1a..3a751fdece43 100644
--- a/modules/playground/src/web_workers/images/single_thread.ts
+++ b/modules/playground/src/web_workers/images/single_thread.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Component, NgModule} from '@angular/core';
+import {NgModule} from '@angular/core';
 import {BrowserModule} from '@angular/platform-browser';
 import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
 

From 826c98e50c78e366d322af0ac25d3da9ceb0b5fb Mon Sep 17 00:00:00 2001
From: Alex Eagle <eagle@post.harvard.edu>
Date: Tue, 27 Sep 2016 17:12:57 -0700
Subject: [PATCH 32/70] fix(ngc): allow ReflectorHost passed as argument to
 CodeGenerator#create (#11951)

---
 modules/@angular/compiler-cli/src/codegen.ts | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/modules/@angular/compiler-cli/src/codegen.ts b/modules/@angular/compiler-cli/src/codegen.ts
index 91048668a019..354ee466c108 100644
--- a/modules/@angular/compiler-cli/src/codegen.ts
+++ b/modules/@angular/compiler-cli/src/codegen.ts
@@ -126,7 +126,7 @@ export class CodeGenerator {
   static create(
       options: AngularCompilerOptions, cliOptions: NgcCliOptions, program: ts.Program,
       compilerHost: ts.CompilerHost, reflectorHostContext?: ReflectorHostContext,
-      resourceLoader?: compiler.ResourceLoader): CodeGenerator {
+      resourceLoader?: compiler.ResourceLoader, reflectorHost?: ReflectorHost): CodeGenerator {
     resourceLoader = resourceLoader || {
       get: (s: string) => {
         if (!compilerHost.fileExists(s)) {
@@ -148,10 +148,12 @@ export class CodeGenerator {
     }
 
     const urlResolver: compiler.UrlResolver = compiler.createOfflineCompileUrlResolver();
-    const usePathMapping = !!options.rootDirs && options.rootDirs.length > 0;
-    const reflectorHost = usePathMapping ?
-        new PathMappedReflectorHost(program, compilerHost, options, reflectorHostContext) :
-        new ReflectorHost(program, compilerHost, options, reflectorHostContext);
+    if (!reflectorHost) {
+      const usePathMapping = !!options.rootDirs && options.rootDirs.length > 0;
+      reflectorHost = usePathMapping ?
+          new PathMappedReflectorHost(program, compilerHost, options, reflectorHostContext) :
+          new ReflectorHost(program, compilerHost, options, reflectorHostContext);
+    }
     const staticReflector = new StaticReflector(reflectorHost);
     StaticAndDynamicReflectionCapabilities.install(staticReflector);
     const htmlParser =

From d2d98dad61bf977f3c73abc3fca52fd8faf86eac Mon Sep 17 00:00:00 2001
From: Florian Kinder <Fank@users.noreply.github.com>
Date: Wed, 28 Sep 2016 22:59:08 +0200
Subject: [PATCH 33/70] docs(forms): Added FormControl initialization
 information (#11948)

---
 modules/@angular/forms/src/model.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/@angular/forms/src/model.ts b/modules/@angular/forms/src/model.ts
index 26c9c6953151..9a7f911d5600 100644
--- a/modules/@angular/forms/src/model.ts
+++ b/modules/@angular/forms/src/model.ts
@@ -625,6 +625,8 @@ export abstract class AbstractControl {
  *
  * You can also initialize the control with a form state object on instantiation,
  * which includes both the value and whether or not the control is disabled.
+ * You can't use the value key without the disabled key; both are required
+ * to use this way of initialization.
  *
  * ```ts
  * const ctrl = new FormControl({value: 'n/a', disabled: true});

From 0851238e787ef8ebb4cfcb7a1143a49e60a244b8 Mon Sep 17 00:00:00 2001
From: Christoph Krautz <chrisse27@users.noreply.github.com>
Date: Thu, 29 Sep 2016 18:45:28 +0200
Subject: [PATCH 34/70] fix(upgrade): bind optional properties when upgrading
 from ng1 (#11411)

Previously, optional properties of a directive/component would be wrongly mapped and thus ignored.

Closes #10181
---
 .../upgrade/src/upgrade_ng1_adapter.ts        |  5 +-
 modules/@angular/upgrade/test/upgrade_spec.ts | 75 +++++++++++++++----
 2 files changed, 64 insertions(+), 16 deletions(-)

diff --git a/modules/@angular/upgrade/src/upgrade_ng1_adapter.ts b/modules/@angular/upgrade/src/upgrade_ng1_adapter.ts
index cc168f2d80ae..7d1c41b59577 100644
--- a/modules/@angular/upgrade/src/upgrade_ng1_adapter.ts
+++ b/modules/@angular/upgrade/src/upgrade_ng1_adapter.ts
@@ -86,7 +86,10 @@ export class UpgradeNg1ComponentAdapterBuilder {
         if ((<any>context).hasOwnProperty(name)) {
           var localName = context[name];
           var type = localName.charAt(0);
-          localName = localName.substr(1) || name;
+          var typeOptions = localName.charAt(1);
+          localName = typeOptions === '?' ? localName.substr(2) : localName.substr(1);
+          localName = localName || name;
+
           var outputName = 'output_' + name;
           var outputNameRename = outputName + ': ' + name;
           var outputNameRenameChange = outputName + ': ' + name + 'Change';
diff --git a/modules/@angular/upgrade/test/upgrade_spec.ts b/modules/@angular/upgrade/test/upgrade_spec.ts
index f32afed0023d..52bbbd27311a 100644
--- a/modules/@angular/upgrade/test/upgrade_spec.ts
+++ b/modules/@angular/upgrade/test/upgrade_spec.ts
@@ -297,12 +297,12 @@ export function main() {
     describe('upgrade ng1 component', () => {
       it('should bind properties, events', async(() => {
            const adapter: UpgradeAdapter = new UpgradeAdapter(forwardRef(() => Ng2Module));
-           var ng1Module = angular.module('ng1', []);
+           const ng1Module = angular.module('ng1', []);
 
-           var ng1 = function() {
+           const ng1 = () => {
              return {
-               template: 'Hello {{fullName}}; A: {{dataA}}; B: {{dataB}}; | ',
-               scope: {fullName: '@', modelA: '=dataA', modelB: '=dataB', event: '&'},
+               template: 'Hello {{fullName}}; A: {{dataA}}; B: {{dataB}}; C: {{modelC}}; | ',
+               scope: {fullName: '@', modelA: '=dataA', modelB: '=dataB', modelC: '=', event: '&'},
                link: function(scope: any /** TODO #9100 */) {
                  scope.$watch('dataB', (v: any /** TODO #9100 */) => {
                    if (v == 'Savkin') {
@@ -317,37 +317,82 @@ export function main() {
              };
            };
            ng1Module.directive('ng1', ng1);
-           var Ng2 =
+           const Ng2 =
                Component({
                  selector: 'ng2',
                  template:
-                     '<ng1 fullName="{{last}}, {{first}}" [modelA]="first" [(modelB)]="last" ' +
+                     '<ng1 fullName="{{last}}, {{first}}, {{city}}" [modelA]="first" [(modelB)]="last" [modelC]="city" ' +
                      '(event)="event=$event"></ng1>' +
-                     '<ng1 fullName="{{\'TEST\'}}" modelA="First" modelB="Last"></ng1>' +
-                     '{{event}}-{{last}}, {{first}}'
+                     '<ng1 fullName="{{\'TEST\'}}" modelA="First" modelB="Last" modelC="City"></ng1>' +
+                     '{{event}}-{{last}}, {{first}}, {{city}}'
                }).Class({
                  constructor: function() {
                    this.first = 'Victor';
                    this.last = 'Savkin';
+                   this.city = 'SF';
                    this.event = '?';
                  }
                });
 
-           var Ng2Module = NgModule({
-                             declarations: [adapter.upgradeNg1Component('ng1'), Ng2],
-                             imports: [BrowserModule],
-                             schemas: [NO_ERRORS_SCHEMA],
-                           }).Class({constructor: function() {}});
+           const Ng2Module = NgModule({
+                               declarations: [adapter.upgradeNg1Component('ng1'), Ng2],
+                               imports: [BrowserModule],
+                               schemas: [NO_ERRORS_SCHEMA],
+                             }).Class({constructor: function() {}});
 
            ng1Module.directive('ng2', adapter.downgradeNg2Component(Ng2));
-           var element = html(`<div><ng2></ng2></div>`);
+           const element = html(`<div><ng2></ng2></div>`);
+           adapter.bootstrap(element, ['ng1']).ready((ref) => {
+             // we need to do setTimeout, because the EventEmitter uses setTimeout to schedule
+             // events, and so without this we would not see the events processed.
+             setTimeout(() => {
+               expect(multiTrim(document.body.textContent))
+                   .toEqual(
+                       'Hello SAVKIN, Victor, SF; A: VICTOR; B: SAVKIN; C: SF; | Hello TEST; A: First; B: Last; C: City; | WORKS-SAVKIN, Victor, SF');
+               ref.dispose();
+             }, 0);
+           });
+         }));
+
+      it('should bind optional properties', async(() => {
+           const adapter: UpgradeAdapter = new UpgradeAdapter(forwardRef(() => Ng2Module));
+           const ng1Module = angular.module('ng1', []);
+
+           const ng1 = () => {
+             return {
+               template: 'Hello; A: {{dataA}}; B: {{modelB}}; | ',
+               scope: {modelA: '=?dataA', modelB: '=?'}
+             };
+           };
+           ng1Module.directive('ng1', ng1);
+           const Ng2 = Component({
+                         selector: 'ng2',
+                         template: '<ng1 [modelA]="first" [modelB]="last"></ng1>' +
+                             '<ng1 modelA="First" modelB="Last"></ng1>' +
+                             '<ng1></ng1>' +
+                             '<ng1></ng1>'
+                       }).Class({
+             constructor: function() {
+               this.first = 'Victor';
+               this.last = 'Savkin';
+             }
+           });
+
+           const Ng2Module = NgModule({
+                               declarations: [adapter.upgradeNg1Component('ng1'), Ng2],
+                               imports: [BrowserModule],
+                               schemas: [NO_ERRORS_SCHEMA],
+                             }).Class({constructor: function() {}});
+
+           ng1Module.directive('ng2', adapter.downgradeNg2Component(Ng2));
+           const element = html(`<div><ng2></ng2></div>`);
            adapter.bootstrap(element, ['ng1']).ready((ref) => {
              // we need to do setTimeout, because the EventEmitter uses setTimeout to schedule
              // events, and so without this we would not see the events processed.
              setTimeout(() => {
                expect(multiTrim(document.body.textContent))
                    .toEqual(
-                       'Hello SAVKIN, Victor; A: VICTOR; B: SAVKIN; | Hello TEST; A: First; B: Last; | WORKS-SAVKIN, Victor');
+                       'Hello; A: Victor; B: Savkin; | Hello; A: First; B: Last; | Hello; A: ; B: ; | Hello; A: ; B: ; |');
                ref.dispose();
              }, 0);
            });

From a4af1561b7ace792e072c62b00bb510a187e8ee7 Mon Sep 17 00:00:00 2001
From: Tobias Bosch <tbosch1009@gmail.com>
Date: Fri, 30 Sep 2016 09:09:31 -0700
Subject: [PATCH 35/70] benchmarks: add ng2_ftl and ng2_switch_ftl benchmarks
 (#11963)

These benchmarks take the output of AoT
and manually tweaks it to explore possible
future changes to the compiler to produce
this output directly.
---
 modules/benchmarks/e2e_test/tree_perf.ts      |  58 +++-
 modules/benchmarks/e2e_test/tree_spec.ts      |  30 +-
 modules/benchmarks/src/tree/ng2_ftl/README.md | 168 +++++++++
 .../src/tree/ng2_ftl/app.ngfactory.ts         | 319 ++++++++++++++++++
 .../benchmarks/src/tree/ng2_ftl/ftl_util.ts   | 199 +++++++++++
 .../benchmarks/src/tree/ng2_ftl/index.html    |  26 ++
 modules/benchmarks/src/tree/ng2_ftl/index.ts  |  41 +++
 .../src/tree/ng2_ftl/ng_if.ngfactory.ts       |  20 ++
 .../src/tree/ng2_ftl/tree.ngfactory.ts        | 127 +++++++
 modules/benchmarks/src/tree/ng2_ftl/tree.ts   |   5 +
 .../src/tree/ng2_ftl/tree_host.ngfactory.ts   |  65 ++++
 .../src/tree/ng2_static_ftl/README.md         |  79 +++++
 .../src/tree/ng2_static_ftl/app.ngfactory.ts  | 319 ++++++++++++++++++
 .../benchmarks/src/tree/ng2_static_ftl/app.ts |   1 +
 .../src/tree/ng2_static_ftl/ftl_util.ts       |  17 +
 .../src/tree/ng2_static_ftl/index.html        |  26 ++
 .../src/tree/ng2_static_ftl/index.ts          |  41 +++
 .../src/tree/ng2_static_ftl/tree.ts           |   7 +
 .../ng2_static_ftl/tree_branch.ngfactory.ts   |  76 +++++
 .../ng2_static_ftl/tree_leaf.ngfactory.ts     |  56 +++
 .../ng2_static_ftl/tree_root.ngfactory.ts     | 150 ++++++++
 modules/e2e_util/e2e_util.ts                  |   4 +-
 22 files changed, 1824 insertions(+), 10 deletions(-)
 create mode 100644 modules/benchmarks/src/tree/ng2_ftl/README.md
 create mode 100644 modules/benchmarks/src/tree/ng2_ftl/app.ngfactory.ts
 create mode 100644 modules/benchmarks/src/tree/ng2_ftl/ftl_util.ts
 create mode 100644 modules/benchmarks/src/tree/ng2_ftl/index.html
 create mode 100644 modules/benchmarks/src/tree/ng2_ftl/index.ts
 create mode 100644 modules/benchmarks/src/tree/ng2_ftl/ng_if.ngfactory.ts
 create mode 100644 modules/benchmarks/src/tree/ng2_ftl/tree.ngfactory.ts
 create mode 100644 modules/benchmarks/src/tree/ng2_ftl/tree.ts
 create mode 100644 modules/benchmarks/src/tree/ng2_ftl/tree_host.ngfactory.ts
 create mode 100644 modules/benchmarks/src/tree/ng2_static_ftl/README.md
 create mode 100644 modules/benchmarks/src/tree/ng2_static_ftl/app.ngfactory.ts
 create mode 100644 modules/benchmarks/src/tree/ng2_static_ftl/app.ts
 create mode 100644 modules/benchmarks/src/tree/ng2_static_ftl/ftl_util.ts
 create mode 100644 modules/benchmarks/src/tree/ng2_static_ftl/index.html
 create mode 100644 modules/benchmarks/src/tree/ng2_static_ftl/index.ts
 create mode 100644 modules/benchmarks/src/tree/ng2_static_ftl/tree.ts
 create mode 100644 modules/benchmarks/src/tree/ng2_static_ftl/tree_branch.ngfactory.ts
 create mode 100644 modules/benchmarks/src/tree/ng2_static_ftl/tree_leaf.ngfactory.ts
 create mode 100644 modules/benchmarks/src/tree/ng2_static_ftl/tree_root.ngfactory.ts

diff --git a/modules/benchmarks/e2e_test/tree_perf.ts b/modules/benchmarks/e2e_test/tree_perf.ts
index 95d9659ed036..c9311db41de4 100644
--- a/modules/benchmarks/e2e_test/tree_perf.ts
+++ b/modules/benchmarks/e2e_test/tree_perf.ts
@@ -44,6 +44,20 @@ describe('tree benchmark perf', () => {
         runTreeBenchmark({
           id: `deepTree.ng2.${worker.id}`,
           url: 'all/benchmarks/src/tree/ng2/index.html',
+          work: worker.work,
+          prepare: worker.prepare,
+        }).then(done, done.fail);
+      });
+
+      it('should run for ng2 ftl', (done) => {
+        runTreeBenchmark({
+          id: `deepTree.ng2.ftl.${worker.id}`,
+          url: 'all/benchmarks/src/tree/ng2_ftl/index.html',
+          work: worker.work,
+          prepare: worker.prepare,
+          // Can't use bundles as we use AoT generated code
+          // which relies on deep imports
+          extraParams: [{name: 'bundles', value: false}]
         }).then(done, done.fail);
       });
 
@@ -51,6 +65,20 @@ describe('tree benchmark perf', () => {
         runTreeBenchmark({
           id: `deepTree.ng2.static.${worker.id}`,
           url: 'all/benchmarks/src/tree/ng2_static/index.html',
+          work: worker.work,
+          prepare: worker.prepare,
+        }).then(done, done.fail);
+      });
+
+      it('should run for ng2 static ftl', (done) => {
+        runTreeBenchmark({
+          id: `deepTree.ng2.ftl.${worker.id}`,
+          url: 'all/benchmarks/src/tree/ng2_static_ftl/index.html',
+          work: worker.work,
+          prepare: worker.prepare,
+          // Can't use bundles as we use AoT generated code
+          // which relies on deep imports
+          extraParams: [{name: 'bundles', value: false}]
         }).then(done, done.fail);
       });
 
@@ -58,6 +86,8 @@ describe('tree benchmark perf', () => {
         runTreeBenchmark({
           id: `deepTree.ng2_switch.${worker.id}`,
           url: 'all/benchmarks/src/tree/ng2_switch/index.html',
+          work: worker.work,
+          prepare: worker.prepare,
         }).then(done, done.fail);
       });
 
@@ -66,6 +96,8 @@ describe('tree benchmark perf', () => {
           id: `deepTree.baseline.${worker.id}`,
           url: 'all/benchmarks/src/tree/baseline/index.html',
           ignoreBrowserSynchronization: true,
+          work: worker.work,
+          prepare: worker.prepare,
         }).then(done, done.fail);
       });
 
@@ -74,6 +106,8 @@ describe('tree benchmark perf', () => {
           id: `deepTree.incremental_dom.${worker.id}`,
           url: 'all/benchmarks/src/tree/incremental_dom/index.html',
           ignoreBrowserSynchronization: true,
+          work: worker.work,
+          prepare: worker.prepare,
         }).then(done, done.fail);
       });
 
@@ -82,6 +116,8 @@ describe('tree benchmark perf', () => {
           id: `deepTree.polymer.${worker.id}`,
           url: 'all/benchmarks/src/tree/polymer/index.html',
           ignoreBrowserSynchronization: true,
+          work: worker.work,
+          prepare: worker.prepare,
         }).then(done, done.fail);
       });
 
@@ -90,22 +126,30 @@ describe('tree benchmark perf', () => {
           id: `deepTree.polymer_leaves.${worker.id}`,
           url: 'all/benchmarks/src/tree/polymer_leaves/index.html',
           ignoreBrowserSynchronization: true,
+          work: worker.work,
+          prepare: worker.prepare,
         }).then(done, done.fail);
       });
     });
   });
 
-  function runTreeBenchmark(
-      config: {id: string, url: string, ignoreBrowserSynchronization?: boolean}) {
+  function runTreeBenchmark(config: {
+    id: string,
+    url: string, ignoreBrowserSynchronization?: boolean,
+    work: () => any,
+    prepare: () => any, extraParams?: {name: string, value: any}[]
+  }) {
+    let params = [{name: 'depth', value: 11}];
+    if (config.extraParams) {
+      params = params.concat(config.extraParams);
+    }
     return runBenchmark({
       id: config.id,
       url: config.url,
       ignoreBrowserSynchronization: config.ignoreBrowserSynchronization,
-      params: [{name: 'depth', value: 9}],
-      work: () => {
-        $('#createDom').click();
-        $('#destroyDom').click();
-      }
+      params: params,
+      work: config.work,
+      prepare: config.prepare
     });
   }
 });
diff --git a/modules/benchmarks/e2e_test/tree_spec.ts b/modules/benchmarks/e2e_test/tree_spec.ts
index 13bb9bac5744..168517df94e6 100644
--- a/modules/benchmarks/e2e_test/tree_spec.ts
+++ b/modules/benchmarks/e2e_test/tree_spec.ts
@@ -18,12 +18,30 @@ describe('tree benchmark spec', () => {
     });
   });
 
+  it('should work for ng2 ftl', () => {
+    testTreeBenchmark({
+      url: 'all/benchmarks/src/tree/ng2_ftl/index.html',
+      // Can't use bundles as we use AoT generated code
+      // which relies on deep imports
+      extraParams: [{name: 'bundles', value: false}]
+    });
+  });
+
   it('should work for ng2 static', () => {
     testTreeBenchmark({
       url: 'all/benchmarks/src/tree/ng2_static/index.html',
     });
   });
 
+  it('should work for ng2 static ftl', () => {
+    testTreeBenchmark({
+      url: 'all/benchmarks/src/tree/ng2_static_ftl/index.html',
+      // Can't use bundles as we use AoT generated code
+      // which relies on deep imports
+      extraParams: [{name: 'bundles', value: false}]
+    });
+  });
+
   it('should work for ng2 switch', () => {
     testTreeBenchmark({
       url: 'all/benchmarks/src/tree/ng2_switch/index.html',
@@ -58,11 +76,19 @@ describe('tree benchmark spec', () => {
     });
   });
 
-  function testTreeBenchmark(openConfig: {url: string, ignoreBrowserSynchronization?: boolean}) {
+  function testTreeBenchmark(openConfig: {
+    url: string,
+    ignoreBrowserSynchronization?: boolean,
+    extraParams?: {name: string, value: any}[]
+  }) {
+    let params = [{name: 'depth', value: 4}];
+    if (openConfig.extraParams) {
+      params = params.concat(openConfig.extraParams);
+    }
     openBrowser({
       url: openConfig.url,
       ignoreBrowserSynchronization: openConfig.ignoreBrowserSynchronization,
-      params: [{name: 'depth', value: 4}],
+      params: params,
     });
     $('#createDom').click();
     expect($('#root').getText()).toContain('0');
diff --git a/modules/benchmarks/src/tree/ng2_ftl/README.md b/modules/benchmarks/src/tree/ng2_ftl/README.md
new file mode 100644
index 000000000000..14b8cb004256
--- /dev/null
+++ b/modules/benchmarks/src/tree/ng2_ftl/README.md
@@ -0,0 +1,168 @@
+# Ng2 Faster Than BaseLine (FTL) Benchmark
+
+This benchmark was produced in a similar way as `ng2_static_ftl`,
+but starting from the `ng2` benchmark, i.e. the benchmark
+that only uses 1 component that contains itself via 2 `NgIf`s.
+
+1. Run AoT over the `TreeComponent` and `AppModule`
+2. Move the `ComponentFactory` and the corresponding host view class
+   from `tree.ngfactory.ts` into `tree_host.ngfactory.ts`
+3. Move the `NgModuleFactory` into the `app.ngfactory.ts`
+4. Optimize the `tree.ngfactory.ts` (see below)
+
+The goal of this benchmark is to explore what kind of
+code the Ng2 compiler should generate in order to get faster.
+I.e. right now, the Ng2 compiler _does not_ produce this kind of code,
+but hopefully will in the future.
+
+
+## Optimizations and cleanups
+
+See `tree.ngfactory.ts` and `tree_leaf.ngfactory.ts`.
+
+Performance:
+
+- remove view factory functions, call the constructor of the view class directly
+- remove `createInternal` and move the logic into the constructor
+- generate direct calls to `detectChangesInternal` / `destroyInternal` of nested components
+  _and_ view containers, don't use `viewChildren` / `contentChildren`
+- remove `Renderer` and `SanitizationService` to update
+  the dom directly via `document.createElement` / `element.appendChild` / setting
+  `Text.nodeValue` / `Element.style....`
+- remove `AppElement` on component host elements
+- custom implementation of `ViewContainerRef` that uses
+  the views as linked list, instead of an array (see `ftl_util`).
+- custom implementation of TemplateRef which not use a closure, only a view and an index,
+  and the view has a factory method that switches over the index
+  (see `ftl_util`).
+- Don't wrap Views into ViewRefs before passing to the user.
+- View does not use an array to store root nodes,
+  but rather has a generated method `visitRootNodes` (see below)
+- ViewContainer, TemplateRef and views have minimal amount of fields
+- use `insertBefore` as primitive.
+
+Code size:
+- inputs for `NgIf`, `TreeComponent` are wrapped into view class / directive wrapper method
+  (see `ng_if.ngfactory.ts` and `tree.ngfactory.ts`).
+- helper methods `createElementAndAppend` / `createTextAndAppend` / `createAnchorAndAppend`
+- remove `injectorGetInternal` assuming we can detect that nobody is injecting an `Injector`
+
+## Properties
+- no allocation of arrays nor closures
+
+## Background: why `visitRootNodes`?
+
+* An embedded view has root nodes that need to be attached / detached
+  to the DOM when the view is inserted.
+* An embedded view can have view containers as root nodes. I.e. the root nodes
+  of a view need to include the root nodes of all views in root view containers
+* An embedded view can have `<ng-content>` as root nodes. I.e. the root
+  nodes of a view need to include the projects nodes, which can
+  include a view container, in which case they need to include the root nodes
+  of all included views as well.
+
+Previous implementation:
+The generated view classes would store a (possible nested) array of root nodes
+that can contain regular DOM nodes as well as ViewContainers.
+The helper method `flattenNestedViewRootNodes` is used to convert this array
+into a flat array of node.
+However, this generates a new array and is probably hard to optimize for
+a vm.
+
+### Solution
+Generate loop functions / methods.
+I.e. a method like:
+```
+loopRootNodes(cb: (obj: any, ctx: any), ctx: any) {
+  cb(this.node0, ctx);
+  ...
+}
+```
+These methods can easily be nested, i.e. a view container
+can just loop over its views and call this method,
+forwarding the callback!
+
+Same is true for projection!
+==> Tried it, no impact on the benchmark!
+
+### Discarded Solution 1)
+Generate `attach` / `detach` method on EmbeddedView,
+which will `insertBefore` the root nodes. Also
+generate `project` and `unproject` methods in the caller
+of a component to add / remove nodes.
+
+Problems:
+- generates a lot of code!
+- projected nodes can only be inserted into the DOM via
+  `insertBefore`, but never via `appendChild` as
+  the generated method `project` does it,
+  and it can do only one of these two, but not both.
+
+### Discarded Solution 2)
+Generate a method `rootNodes` on every view that will
+do produce a flattened array of nodes by generating the
+right `concat` statements.
+
+Problems:
+- allocates arrays and `concat` calls that slows things down
+  (an experiment showed about about 2-5%).
+
+## Experiments tried
+- just the fact of having another base class in the prototype chain
+  is not a problem!
+- Using a linked list over the views vs an array in ViewContainerRef
+  has no impact on performance, given that we use `Array.prototype.push`
+  for adding if possible (only tried with ngIf though...)
+  * Using `Array.prototype.splice` to add made benchmark 2% slower though!
+- creating an array with root nodes does not make the benchmark much slower.
+  * Using `flattenNestedViewRootNodes` made it 5-10% slower!
+  * Note that this benchmark only includes `NgIf`, i.e. it only
+    inserts 1 entry into the array.
+- creating an additional comment node for the view container,
+  so it is safe to do `insertBefore`
+  * this slows the benchmark down by 14% (added 2 comment nodes)!
+  ==> the number of comment nodes is important!
+
+## Open experiments:
+- using ViewRef as a separate wrapper, compared to
+  using the view itself as ref.
+- using AppElement with an injector, native node, ...,
+  compared to not having all of these fields
+- using `insertAfter` instead of `insertBefore`?
+
+## Initial resuls: size
+
+File size for view class of the component + the 2 embedded view classes (without imports nor host view factory):
+* before: 140 LOC
+* after: 104 LOC
+
+## Initial results: Deep Tree Benchmark
+
+BENCHMARK deepTree....
+Description:
+- bundles: false
+- depth: 11
+- forceGc: false
+- regressionSlopeMetric: scriptTime
+- runId: f9ae32f0-8580-11e6-914d-9f4f8dbfb5e8
+- sampleSize: 20
+- userAgent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/53.0.2785.116 Safari/537.36
+
+...createOnly   |           gcAmount |             gcTime |        majorGcTime |     pureScriptTime |         renderTime |         scriptTime
+--------------- | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------
+ng2             |       5926.64+-11% |          17.46+-5% |          0.02+-44% |          96.74+-9% |          49.72+-5% |         114.19+-8%
+ng2.ftl         |       584.50+-435% |         0.43+-435% |         0.00+-435% |          33.98+-7% |          50.27+-5% |          33.98+-7%
+baseline        |               0.00 |               0.00 |               0.00 |          15.83+-7% |          45.75+-4% |          15.83+-7%
+incremental_dom |       100.82+-302% |         1.64+-321% |         0.00+-304% |          53.43+-9% |          43.96+-4% |         55.07+-13%
+
+...update                   gcAmount |             gcTime |        majorGcTime |     pureScriptTime |         renderTime |         scriptTime
+--------------- | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------
+ng2             |               0.00 |         0.00+-435% |         0.00+-435% |          22.82+-9% |          29.52+-6% |          22.82+-9%
+ng2.ftl         |       219.72+-301% |         0.97+-300% |         0.00+-302% |         17.37+-10% |          29.27+-5% |         17.37+-10%
+baseline        |       530.73+-178% |         0.55+-281% |         0.35+-434% |          25.82+-8% |         31.67+-11% |          25.82+-8%
+incremental_dom |      1057.56+-200% |         0.28+-201% |         0.00+-204% |          22.50+-9% |          28.03+-4% |          22.50+-9%
+
+Ratios (create, pureScriptTime):
+- 2.8x faster than current implementation
+- 1.5x faster than incremental DOM
+- 2.1x slower than baseline
diff --git a/modules/benchmarks/src/tree/ng2_ftl/app.ngfactory.ts b/modules/benchmarks/src/tree/ng2_ftl/app.ngfactory.ts
new file mode 100644
index 000000000000..3e6af9047725
--- /dev/null
+++ b/modules/benchmarks/src/tree/ng2_ftl/app.ngfactory.ts
@@ -0,0 +1,319 @@
+/**
+ * This file is generated by the Angular 2 template compiler.
+ * Do not edit.
+ */
+/* tslint:disable */
+
+import * as import2 from '@angular/common/src/common_module';
+import * as import5 from '@angular/common/src/localization';
+import * as import6 from '@angular/core/src/application_init';
+import * as import3 from '@angular/core/src/application_module';
+import * as import8 from '@angular/core/src/application_ref';
+import * as import19 from '@angular/core/src/application_tokens';
+import * as import31 from '@angular/core/src/change_detection/differs/iterable_differs';
+import * as import32 from '@angular/core/src/change_detection/differs/keyvalue_differs';
+import * as import24 from '@angular/core/src/console';
+import * as import17 from '@angular/core/src/di/injector';
+import * as import26 from '@angular/core/src/error_handler';
+import * as import33 from '@angular/core/src/i18n/tokens';
+import * as import25 from '@angular/core/src/i18n/tokens';
+import * as import9 from '@angular/core/src/linker/compiler';
+import * as import0 from '@angular/core/src/linker/ng_module_factory';
+import * as import15 from '@angular/core/src/linker/view_utils';
+import * as import29 from '@angular/core/src/render/api';
+import * as import30 from '@angular/core/src/security';
+import * as import7 from '@angular/core/src/testability/testability';
+import * as import22 from '@angular/core/src/zone/ng_zone';
+import * as import4 from '@angular/platform-browser/src/browser';
+import * as import16 from '@angular/platform-browser/src/browser/title';
+import * as import28 from '@angular/platform-browser/src/dom/animation_driver';
+import * as import23 from '@angular/platform-browser/src/dom/debug/ng_probe';
+import * as import13 from '@angular/platform-browser/src/dom/dom_renderer';
+import * as import27 from '@angular/platform-browser/src/dom/dom_tokens';
+import * as import20 from '@angular/platform-browser/src/dom/events/dom_events';
+import * as import11 from '@angular/platform-browser/src/dom/events/event_manager';
+import * as import10 from '@angular/platform-browser/src/dom/events/hammer_gestures';
+import * as import21 from '@angular/platform-browser/src/dom/events/key_events';
+import * as import12 from '@angular/platform-browser/src/dom/shared_styles_host';
+import * as import14 from '@angular/platform-browser/src/security/dom_sanitization_service';
+
+import * as import1 from './tree';
+import * as import18 from './tree_host.ngfactory';
+
+class AppModuleInjector extends import0.NgModuleInjector<import1.AppModule> {
+  _CommonModule_0: import2.CommonModule;
+  _ApplicationModule_1: import3.ApplicationModule;
+  _BrowserModule_2: import4.BrowserModule;
+  _AppModule_3: import1.AppModule;
+  __LOCALE_ID_4: any;
+  __NgLocalization_5: import5.NgLocaleLocalization;
+  _ErrorHandler_6: any;
+  _ApplicationInitStatus_7: import6.ApplicationInitStatus;
+  _Testability_8: import7.Testability;
+  _ApplicationRef__9: import8.ApplicationRef_;
+  __ApplicationRef_10: any;
+  __Compiler_11: import9.Compiler;
+  __APP_ID_12: any;
+  __DOCUMENT_13: any;
+  __HAMMER_GESTURE_CONFIG_14: import10.HammerGestureConfig;
+  __EVENT_MANAGER_PLUGINS_15: any[];
+  __EventManager_16: import11.EventManager;
+  __DomSharedStylesHost_17: import12.DomSharedStylesHost;
+  __AnimationDriver_18: any;
+  __DomRootRenderer_19: import13.DomRootRenderer_;
+  __RootRenderer_20: any;
+  __DomSanitizer_21: import14.DomSanitizerImpl;
+  __Sanitizer_22: any;
+  __ViewUtils_23: import15.ViewUtils;
+  __IterableDiffers_24: any;
+  __KeyValueDiffers_25: any;
+  __SharedStylesHost_26: any;
+  __Title_27: import16.Title;
+  __TRANSLATIONS_FORMAT_28: any;
+  constructor(parent: import17.Injector) {
+    super(parent, [import18.TreeComponentNgFactory], [import18.TreeComponentNgFactory]);
+  }
+  get _LOCALE_ID_4(): any {
+    if ((this.__LOCALE_ID_4 == (null as any))) {
+      (this.__LOCALE_ID_4 = (null as any));
+    }
+    return this.__LOCALE_ID_4;
+  }
+  get _NgLocalization_5(): import5.NgLocaleLocalization {
+    if ((this.__NgLocalization_5 == (null as any))) {
+      (this.__NgLocalization_5 = new import5.NgLocaleLocalization(this._LOCALE_ID_4));
+    }
+    return this.__NgLocalization_5;
+  }
+  get _ApplicationRef_10(): any {
+    if ((this.__ApplicationRef_10 == (null as any))) {
+      (this.__ApplicationRef_10 = this._ApplicationRef__9);
+    }
+    return this.__ApplicationRef_10;
+  }
+  get _Compiler_11(): import9.Compiler {
+    if ((this.__Compiler_11 == (null as any))) {
+      (this.__Compiler_11 = new import9.Compiler());
+    }
+    return this.__Compiler_11;
+  }
+  get _APP_ID_12(): any {
+    if ((this.__APP_ID_12 == (null as any))) {
+      (this.__APP_ID_12 = import19._appIdRandomProviderFactory());
+    }
+    return this.__APP_ID_12;
+  }
+  get _DOCUMENT_13(): any {
+    if ((this.__DOCUMENT_13 == (null as any))) {
+      (this.__DOCUMENT_13 = import4._document());
+    }
+    return this.__DOCUMENT_13;
+  }
+  get _HAMMER_GESTURE_CONFIG_14(): import10.HammerGestureConfig {
+    if ((this.__HAMMER_GESTURE_CONFIG_14 == (null as any))) {
+      (this.__HAMMER_GESTURE_CONFIG_14 = new import10.HammerGestureConfig());
+    }
+    return this.__HAMMER_GESTURE_CONFIG_14;
+  }
+  get _EVENT_MANAGER_PLUGINS_15(): any[] {
+    if ((this.__EVENT_MANAGER_PLUGINS_15 == (null as any))) {
+      (this.__EVENT_MANAGER_PLUGINS_15 = [
+        new import20.DomEventsPlugin(), new import21.KeyEventsPlugin(),
+        new import10.HammerGesturesPlugin(this._HAMMER_GESTURE_CONFIG_14)
+      ]);
+    }
+    return this.__EVENT_MANAGER_PLUGINS_15;
+  }
+  get _EventManager_16(): import11.EventManager {
+    if ((this.__EventManager_16 == (null as any))) {
+      (this.__EventManager_16 = new import11.EventManager(
+           this._EVENT_MANAGER_PLUGINS_15, this.parent.get(import22.NgZone)));
+    }
+    return this.__EventManager_16;
+  }
+  get _DomSharedStylesHost_17(): import12.DomSharedStylesHost {
+    if ((this.__DomSharedStylesHost_17 == (null as any))) {
+      (this.__DomSharedStylesHost_17 = new import12.DomSharedStylesHost(this._DOCUMENT_13));
+    }
+    return this.__DomSharedStylesHost_17;
+  }
+  get _AnimationDriver_18(): any {
+    if ((this.__AnimationDriver_18 == (null as any))) {
+      (this.__AnimationDriver_18 = import4._resolveDefaultAnimationDriver());
+    }
+    return this.__AnimationDriver_18;
+  }
+  get _DomRootRenderer_19(): import13.DomRootRenderer_ {
+    if ((this.__DomRootRenderer_19 == (null as any))) {
+      (this.__DomRootRenderer_19 = new import13.DomRootRenderer_(
+           this._DOCUMENT_13, this._EventManager_16, this._DomSharedStylesHost_17,
+           this._AnimationDriver_18));
+    }
+    return this.__DomRootRenderer_19;
+  }
+  get _RootRenderer_20(): any {
+    if ((this.__RootRenderer_20 == (null as any))) {
+      (this.__RootRenderer_20 = import23._createConditionalRootRenderer(
+           this._DomRootRenderer_19, this.parent.get(import23.NgProbeToken, (null as any))));
+    }
+    return this.__RootRenderer_20;
+  }
+  get _DomSanitizer_21(): import14.DomSanitizerImpl {
+    if ((this.__DomSanitizer_21 == (null as any))) {
+      (this.__DomSanitizer_21 = new import14.DomSanitizerImpl());
+    }
+    return this.__DomSanitizer_21;
+  }
+  get _Sanitizer_22(): any {
+    if ((this.__Sanitizer_22 == (null as any))) {
+      (this.__Sanitizer_22 = this._DomSanitizer_21);
+    }
+    return this.__Sanitizer_22;
+  }
+  get _ViewUtils_23(): import15.ViewUtils {
+    if ((this.__ViewUtils_23 == (null as any))) {
+      (this.__ViewUtils_23 =
+           new import15.ViewUtils(this._RootRenderer_20, this._APP_ID_12, this._Sanitizer_22));
+    }
+    return this.__ViewUtils_23;
+  }
+  get _IterableDiffers_24(): any {
+    if ((this.__IterableDiffers_24 == (null as any))) {
+      (this.__IterableDiffers_24 = import3._iterableDiffersFactory());
+    }
+    return this.__IterableDiffers_24;
+  }
+  get _KeyValueDiffers_25(): any {
+    if ((this.__KeyValueDiffers_25 == (null as any))) {
+      (this.__KeyValueDiffers_25 = import3._keyValueDiffersFactory());
+    }
+    return this.__KeyValueDiffers_25;
+  }
+  get _SharedStylesHost_26(): any {
+    if ((this.__SharedStylesHost_26 == (null as any))) {
+      (this.__SharedStylesHost_26 = this._DomSharedStylesHost_17);
+    }
+    return this.__SharedStylesHost_26;
+  }
+  get _Title_27(): import16.Title {
+    if ((this.__Title_27 == (null as any))) {
+      (this.__Title_27 = new import16.Title());
+    }
+    return this.__Title_27;
+  }
+  get _TRANSLATIONS_FORMAT_28(): any {
+    if ((this.__TRANSLATIONS_FORMAT_28 == (null as any))) {
+      (this.__TRANSLATIONS_FORMAT_28 = (null as any));
+    }
+    return this.__TRANSLATIONS_FORMAT_28;
+  }
+  createInternal(): import1.AppModule {
+    this._CommonModule_0 = new import2.CommonModule();
+    this._ApplicationModule_1 = new import3.ApplicationModule();
+    this._BrowserModule_2 =
+        new import4.BrowserModule(this.parent.get(import4.BrowserModule, (null as any)));
+    this._AppModule_3 = new import1.AppModule();
+    this._ErrorHandler_6 = import4.errorHandler();
+    this._ApplicationInitStatus_7 =
+        new import6.ApplicationInitStatus(this.parent.get(import6.APP_INITIALIZER, (null as any)));
+    this._Testability_8 = new import7.Testability(this.parent.get(import22.NgZone));
+    this._ApplicationRef__9 = new import8.ApplicationRef_(
+        this.parent.get(import22.NgZone), this.parent.get(import24.Console), this,
+        this._ErrorHandler_6, this, this._ApplicationInitStatus_7,
+        this.parent.get(import7.TestabilityRegistry, (null as any)), this._Testability_8);
+    return this._AppModule_3;
+  }
+  getInternal(token: any, notFoundResult: any): any {
+    if ((token === import2.CommonModule)) {
+      return this._CommonModule_0;
+    }
+    if ((token === import3.ApplicationModule)) {
+      return this._ApplicationModule_1;
+    }
+    if ((token === import4.BrowserModule)) {
+      return this._BrowserModule_2;
+    }
+    if ((token === import1.AppModule)) {
+      return this._AppModule_3;
+    }
+    if ((token === import25.LOCALE_ID)) {
+      return this._LOCALE_ID_4;
+    }
+    if ((token === import5.NgLocalization)) {
+      return this._NgLocalization_5;
+    }
+    if ((token === import26.ErrorHandler)) {
+      return this._ErrorHandler_6;
+    }
+    if ((token === import6.ApplicationInitStatus)) {
+      return this._ApplicationInitStatus_7;
+    }
+    if ((token === import7.Testability)) {
+      return this._Testability_8;
+    }
+    if ((token === import8.ApplicationRef_)) {
+      return this._ApplicationRef__9;
+    }
+    if ((token === import8.ApplicationRef)) {
+      return this._ApplicationRef_10;
+    }
+    if ((token === import9.Compiler)) {
+      return this._Compiler_11;
+    }
+    if ((token === import19.APP_ID)) {
+      return this._APP_ID_12;
+    }
+    if ((token === import27.DOCUMENT)) {
+      return this._DOCUMENT_13;
+    }
+    if ((token === import10.HAMMER_GESTURE_CONFIG)) {
+      return this._HAMMER_GESTURE_CONFIG_14;
+    }
+    if ((token === import11.EVENT_MANAGER_PLUGINS)) {
+      return this._EVENT_MANAGER_PLUGINS_15;
+    }
+    if ((token === import11.EventManager)) {
+      return this._EventManager_16;
+    }
+    if ((token === import12.DomSharedStylesHost)) {
+      return this._DomSharedStylesHost_17;
+    }
+    if ((token === import28.AnimationDriver)) {
+      return this._AnimationDriver_18;
+    }
+    if ((token === import13.DomRootRenderer)) {
+      return this._DomRootRenderer_19;
+    }
+    if ((token === import29.RootRenderer)) {
+      return this._RootRenderer_20;
+    }
+    if ((token === import14.DomSanitizer)) {
+      return this._DomSanitizer_21;
+    }
+    if ((token === import30.Sanitizer)) {
+      return this._Sanitizer_22;
+    }
+    if ((token === import15.ViewUtils)) {
+      return this._ViewUtils_23;
+    }
+    if ((token === import31.IterableDiffers)) {
+      return this._IterableDiffers_24;
+    }
+    if ((token === import32.KeyValueDiffers)) {
+      return this._KeyValueDiffers_25;
+    }
+    if ((token === import12.SharedStylesHost)) {
+      return this._SharedStylesHost_26;
+    }
+    if ((token === import16.Title)) {
+      return this._Title_27;
+    }
+    if ((token === import33.TRANSLATIONS_FORMAT)) {
+      return this._TRANSLATIONS_FORMAT_28;
+    }
+    return notFoundResult;
+  }
+  destroyInternal(): void { this._ApplicationRef__9.ngOnDestroy(); }
+}
+export const AppModuleNgFactory: import0.NgModuleFactory<import1.AppModule> =
+    new import0.NgModuleFactory(AppModuleInjector, import1.AppModule);
\ No newline at end of file
diff --git a/modules/benchmarks/src/tree/ng2_ftl/ftl_util.ts b/modules/benchmarks/src/tree/ng2_ftl/ftl_util.ts
new file mode 100644
index 000000000000..0b8c69b2faf9
--- /dev/null
+++ b/modules/benchmarks/src/tree/ng2_ftl/ftl_util.ts
@@ -0,0 +1,199 @@
+import {ComponentFactory, ComponentRef, ElementRef, Injector, TemplateRef, ViewContainerRef, ViewRef} from '@angular/core';
+
+export function unimplemented(): any {
+  throw new Error('unimplemented');
+}
+
+export interface FtlView<C> {
+  context: C;
+  detectChangesInternal(throwOnChange: boolean): void;
+  createEmbeddedView?<NC>(context: NC, nodeIndex: number): FtlEmbeddedView<NC>;
+  destroyInternal(): void;
+}
+
+export interface FtlEmbeddedView<C> extends FtlView<C> {
+  // Note: if the view has a view container as first node,
+  // create a comment node before it. This makes
+  // inserting a view before this view simpler!
+  _node0: any;
+  prev: FtlEmbeddedView<any>;
+  next: FtlEmbeddedView<any>;
+  // Purpose of the `ctx` argument:
+  // Allows to use top level functions, i.e. no need to create closures!
+  visitRootNodes<CTX>(callback: (node: any, ctx: CTX) => void, ctx: CTX): void;
+}
+
+// TODO(tbosch): FTL EmbeddedViewRefs should have no
+// methods / properties at all. Because of this we can just use the FtlView for it as well!
+// TODO(tbosch): We can't cast to EmbededViewRef as that also has the `rootNodes` filled
+// -> would need to generate code for that as well.
+//    Rather: change API for FTL to allow to call View.attachBefore / View.detach
+//    -> faster and we don't need to flatten the root nodes!
+export type FtlEmbeddedViewRef<C> = FtlView<C>;
+
+export class FtlTemplateRef<C> implements TemplateRef<C> {
+  constructor(private _index: number, private _view: FtlView<any>) {}
+  get elementRef(): ElementRef { return unimplemented(); }
+  createEmbeddedView(context: C): any {
+    return this._view.createEmbeddedView(context, this._index);
+  }
+}
+
+export class FtlViewContainerRef implements ViewContainerRef {
+  private _firstView: FtlEmbeddedView<any> = null;
+  private _lastView: FtlEmbeddedView<any> = null;
+  private _length = 0;
+
+  constructor(private _anchor: any) {}
+
+  detectChangesInternal(throwOnChange: boolean) {
+    let view = this._firstView;
+    while (view) {
+      view.detectChangesInternal(throwOnChange);
+      view = view.next;
+    }
+  }
+
+  // TODO(tbosch): don't allow this API in FTL mode!
+  get element(): ElementRef { return <ElementRef>unimplemented(); }
+
+  // TODO(tbosch): don't allow this API in FTL mode!
+  get injector(): Injector { return <Injector>unimplemented(); }
+
+  // TODO(tbosch): don't allow this API in FTL mode!
+  get parentInjector(): Injector { return <Injector>unimplemented(); }
+
+  destroyInternal() {
+    let view = this._firstView;
+    while (view) {
+      view.destroyInternal();
+      view = view.next;
+    }
+  }
+
+  clear(): void {
+    let view = this._firstView;
+    while (view) {
+      detachView(view);
+      view.destroyInternal();
+      view = view.next;
+    }
+    this._firstView = null;
+    this._lastView = null;
+    this._length = 0;
+  }
+
+  get(index: number): any {
+    var result = this._firstView;
+    while (index > 0 && result) {
+      result = result.next;
+      index--;
+    }
+    return result;
+  }
+
+  get length(): number { return this._length; };
+
+  createEmbeddedView<C>(templateRef: TemplateRef<C>, context?: C, index?: number): any {
+    const view = templateRef.createEmbeddedView(context);
+    return this.insert(view, index);
+  }
+
+  createComponent<C>(
+      componentFactory: ComponentFactory<C>, index?: number, injector?: Injector,
+      projectableNodes?: any[][]): ComponentRef<C> {
+    // TODO(tbosch): implement this!
+    return unimplemented();
+  }
+
+  insert(viewRef: ViewRef, index?: number): any {
+    const view: FtlEmbeddedView<any> = <any>viewRef;
+    let insertBeforeNode: any;
+    if (this._length === 0) {
+      this._firstView = this._lastView = view;
+      insertBeforeNode = this._anchor;
+      view.prev = null;
+      view.next = null;
+    } else if (index >= this._length) {
+      view.prev = this._lastView;
+      view.next = null;
+      this._lastView.next = view;
+      this._lastView = view;
+      insertBeforeNode = this._anchor;
+    } else {
+      // TODO(tbosch): implement this!
+      unimplemented();
+    }
+    attachViewBefore(view, insertBeforeNode);
+    this._length++;
+  }
+
+  detach(index?: number): any {
+    let view: FtlEmbeddedView<any>;
+    if (this._length === 1) {
+      view = this._firstView;
+      this._firstView = this._lastView = null;
+    } else if (index >= this._length) {
+      view = this._lastView;
+      this._lastView = view.prev;
+      view.prev = null;
+      this._lastView.next = null;
+    } else {
+      // TODO(tbosch): implement this!
+      unimplemented();
+    }
+    this._length--;
+    detachView(view);
+    return view;
+  }
+
+  move(viewRef: ViewRef, currentIndex: number): ViewRef {
+    // TODO(tbosch): implement this!
+    return unimplemented();
+  }
+
+  indexOf(viewRef: ViewRef): number {
+    // TODO(tbosch): implement this!
+    return unimplemented();
+  }
+
+  remove(index?: number): void {
+    var view: FtlView<any> = <any>this.detach(index);
+    view.destroyInternal();
+  }
+}
+
+function attachViewBefore(view: FtlEmbeddedView<any>, node: any) {
+  const parent = node.parentNode;
+  view.visitRootNodes(insertBefore, {parent: parent, refNode: node});
+}
+
+function insertBefore(node: any, ctx: {parent: any, refNode: any}) {
+  ctx.parent.insertBefore(node, ctx.refNode);
+}
+
+function detachView(view: FtlEmbeddedView<any>) {
+  view.visitRootNodes(remove, null);
+}
+
+function remove(node: any, ctx: any) {
+  node.remove();
+}
+
+export function createElementAndAppend(parent: any, name: string) {
+  const el = document.createElement(name);
+  parent.appendChild(el);
+  return el;
+}
+
+export function createTextAndAppend(parent: any) {
+  const txt = document.createTextNode('');
+  parent.appendChild(txt);
+  return txt;
+}
+
+export function createAnchorAndAppend(parent: any) {
+  const txt = document.createComment('');
+  parent.appendChild(txt);
+  return txt;
+}
\ No newline at end of file
diff --git a/modules/benchmarks/src/tree/ng2_ftl/index.html b/modules/benchmarks/src/tree/ng2_ftl/index.html
new file mode 100644
index 000000000000..0406a00d679e
--- /dev/null
+++ b/modules/benchmarks/src/tree/ng2_ftl/index.html
@@ -0,0 +1,26 @@
+<!doctype html>
+<html>
+<body>
+  <h2>Params</h2>
+  <form>
+    Depth:
+    <input type="number" name="depth" placeholder="depth" value="9">
+    <br>
+    <button>Apply</button>
+  </form>
+
+  <h2>Ng2 FTL Tree Benchmark</h2>
+  <p>
+    <button id="destroyDom">destroyDom</button>
+    <button id="createDom">createDom</button>
+    <button id="updateDomProfile">profile updateDom</button>
+    <button id="createDomProfile">profile createDom</button>
+  </p>
+
+  <div>
+    <tree id="root"></tree>
+  </div>
+
+  <script src="../../bootstrap_ng2.js"></script>
+</body>
+</html>
\ No newline at end of file
diff --git a/modules/benchmarks/src/tree/ng2_ftl/index.ts b/modules/benchmarks/src/tree/ng2_ftl/index.ts
new file mode 100644
index 000000000000..6790e9057f00
--- /dev/null
+++ b/modules/benchmarks/src/tree/ng2_ftl/index.ts
@@ -0,0 +1,41 @@
+import {ApplicationRef, NgModule, enableProdMode} from '@angular/core';
+import {platformBrowser} from '@angular/platform-browser';
+
+import {bindAction, profile} from '../../util';
+import {TreeNode, buildTree, emptyTree} from '../util';
+
+import {AppModuleNgFactory} from './app.ngfactory';
+import {TreeComponent} from './tree';
+
+export function main() {
+  let tree: TreeComponent;
+  let appRef: ApplicationRef;
+
+  function destroyDom() {
+    tree.data = emptyTree;
+    appRef.tick();
+  }
+
+  function createDom() {
+    tree.data = buildTree();
+    appRef.tick();
+  }
+
+  function noop() {}
+
+  function init() {
+    enableProdMode();
+    platformBrowser().bootstrapModuleFactory(AppModuleNgFactory).then((ref) => {
+      const injector = ref.injector;
+      appRef = injector.get(ApplicationRef);
+
+      tree = appRef.components[0].instance;
+      bindAction('#destroyDom', destroyDom);
+      bindAction('#createDom', createDom);
+      bindAction('#updateDomProfile', profile(createDom, noop, 'update'));
+      bindAction('#createDomProfile', profile(createDom, destroyDom, 'create'));
+    });
+  }
+
+  init();
+}
diff --git a/modules/benchmarks/src/tree/ng2_ftl/ng_if.ngfactory.ts b/modules/benchmarks/src/tree/ng2_ftl/ng_if.ngfactory.ts
new file mode 100644
index 000000000000..b3ff2b141f76
--- /dev/null
+++ b/modules/benchmarks/src/tree/ng2_ftl/ng_if.ngfactory.ts
@@ -0,0 +1,20 @@
+import {NgIf} from '@angular/common';
+import {TemplateRef, ViewContainerRef} from '@angular/core';
+import * as import7 from '@angular/core/src/change_detection/change_detection';
+import * as import4 from '@angular/core/src/linker/view_utils';
+
+export class NgIfWrapper {
+  directive: NgIf;
+  _expr_0: any;
+  constructor(viewContainerRef: ViewContainerRef, templateRef: TemplateRef<any>) {
+    this.directive = new NgIf(viewContainerRef, templateRef);
+    this._expr_0 = import7.UNINITIALIZED;
+  }
+
+  updateNgIf(throwOnChange: boolean, currVal: any) {
+    if (import4.checkBinding(throwOnChange, this._expr_0, currVal)) {
+      this.directive.ngIf = currVal;
+      this._expr_0 = currVal;
+    }
+  }
+}
diff --git a/modules/benchmarks/src/tree/ng2_ftl/tree.ngfactory.ts b/modules/benchmarks/src/tree/ng2_ftl/tree.ngfactory.ts
new file mode 100644
index 000000000000..9fcf948ec45a
--- /dev/null
+++ b/modules/benchmarks/src/tree/ng2_ftl/tree.ngfactory.ts
@@ -0,0 +1,127 @@
+/**
+ * This file is hand tweeked based on
+ * the out put of the Angular 2 template compiler
+ * and then hand tweeked to show possible future output.
+ */
+/* tslint:disable */
+
+import * as import10 from '@angular/common/src/directives/ng_if';
+import * as import7 from '@angular/core/src/change_detection/change_detection';
+import * as import5 from '@angular/core/src/di/injector';
+import * as import9 from '@angular/core/src/linker/component_factory';
+import * as import2 from '@angular/core/src/linker/element';
+import * as import11 from '@angular/core/src/linker/template_ref';
+import * as import1 from '@angular/core/src/linker/view';
+import * as import6 from '@angular/core/src/linker/view_type';
+import * as import4 from '@angular/core/src/linker/view_utils';
+import * as import8 from '@angular/core/src/metadata/view';
+import * as import0 from '@angular/core/src/render/api';
+import * as import12 from '@angular/core/src/security';
+
+import {FtlEmbeddedView, FtlTemplateRef, FtlView, FtlViewContainerRef, createAnchorAndAppend, createElementAndAppend, createTextAndAppend} from './ftl_util';
+import {NgIfWrapper} from './ng_if.ngfactory';
+import * as import3 from './tree';
+
+
+export class _View_TreeComponent0 implements FtlView<import3.TreeComponent> {
+  context: import3.TreeComponent;
+  _el_0: any;
+  _text_1: any;
+  _anchor_2: any;
+  _vc_2: FtlViewContainerRef;
+  _TemplateRef_2_5: any;
+  _NgIf_2_6: NgIfWrapper;
+  _anchor_3: any;
+  _vc_3: FtlViewContainerRef;
+  _TemplateRef_3_5: any;
+  _NgIf_3_6: NgIfWrapper;
+  _expr_0: any;
+  _expr_1: any;
+  _expr_2: any;
+  constructor(parentRenderNode: any) {
+    this.context = new import3.TreeComponent();
+    this._el_0 = createElementAndAppend(parentRenderNode, 'span');
+    this._text_1 = createTextAndAppend(this._el_0);
+    this._anchor_2 = createAnchorAndAppend(parentRenderNode);
+    this._TemplateRef_2_5 = new FtlTemplateRef(2, this);
+    this._vc_2 = new FtlViewContainerRef(this._anchor_2);
+    this._NgIf_2_6 = new NgIfWrapper(this._vc_2, this._TemplateRef_2_5);
+    this._anchor_3 = createAnchorAndAppend(parentRenderNode);
+    this._TemplateRef_3_5 = new FtlTemplateRef(3, this);
+    this._vc_3 = new FtlViewContainerRef(this._anchor_3);
+    this._NgIf_3_6 = new NgIfWrapper(this._vc_3, this._TemplateRef_3_5);
+    this._expr_0 = import7.UNINITIALIZED;
+    this._expr_1 = import7.UNINITIALIZED;
+    this._expr_2 = import7.UNINITIALIZED;
+  }
+  detectChangesInternal(throwOnChange: boolean): void {
+    this._NgIf_2_6.updateNgIf(throwOnChange, (this.context.data.right != (null as any)));
+    this._NgIf_3_6.updateNgIf(throwOnChange, (this.context.data.left != (null as any)));
+    this._vc_2.detectChangesInternal(throwOnChange);
+    this._vc_3.detectChangesInternal(throwOnChange);
+    const currVal_0: any = ((this.context.data.depth % 2) ? '' : 'grey');
+    if (import4.checkBinding(throwOnChange, this._expr_0, currVal_0)) {
+      this._el_0.style.backgroundColor = currVal_0;
+      this._expr_0 = currVal_0;
+    }
+    const currVal_1: any = import4.interpolate(1, ' ', this.context.data.value, ' ');
+    if (import4.checkBinding(throwOnChange, this._expr_1, currVal_1)) {
+      this._text_1.nodeValue = currVal_1;
+      this._expr_1 = currVal_1;
+    }
+  }
+  destroyInternal() {
+    this._vc_2.destroyInternal();
+    this._vc_3.destroyInternal();
+  }
+  updateData(throwOnChange: boolean, currVal: any) {
+    if (import4.checkBinding(throwOnChange, this._expr_2, currVal)) {
+      this.context.data = currVal;
+      this._expr_2 = currVal;
+    }
+  }
+  createEmbeddedView(context: any, nodeIndex: number): any {
+    switch (nodeIndex) {
+      case 2:
+        return new _View_TreeComponent1(this, context);
+      case 3:
+        return new _View_TreeComponent2(this, context);
+      default:
+        return null;
+    }
+  }
+}
+
+class _View_TreeComponent1 implements FtlEmbeddedView<any> {
+  _node0: any;
+  _TreeComponent_0_4: _View_TreeComponent0;
+  prev: FtlEmbeddedView<any>;
+  next: FtlEmbeddedView<any>;
+  constructor(private parent: _View_TreeComponent0, public context: any) {
+    this._node0 = document.createElement('tree');
+    this._TreeComponent_0_4 = new _View_TreeComponent0(this._node0);
+  }
+  detectChangesInternal(throwOnChange: boolean): void {
+    this._TreeComponent_0_4.updateData(throwOnChange, this.parent.context.data.right);
+    this._TreeComponent_0_4.detectChangesInternal(throwOnChange);
+  }
+  visitRootNodes(cb: (...args: any[]) => void, ctx: any) { cb(this._node0, ctx); }
+  destroyInternal() { this._TreeComponent_0_4.destroyInternal(); }
+}
+
+class _View_TreeComponent2 implements FtlEmbeddedView<any> {
+  _node0: any;
+  _TreeComponent_0_4: _View_TreeComponent0;
+  prev: FtlEmbeddedView<any>;
+  next: FtlEmbeddedView<any>;
+  constructor(private parent: _View_TreeComponent0, public context: any) {
+    this._node0 = document.createElement('tree');
+    this._TreeComponent_0_4 = new _View_TreeComponent0(this._node0);
+  }
+  detectChangesInternal(throwOnChange: boolean): void {
+    this._TreeComponent_0_4.updateData(throwOnChange, this.parent.context.data.left);
+    this._TreeComponent_0_4.detectChangesInternal(throwOnChange);
+  }
+  visitRootNodes(cb: (...args: any[]) => void, ctx: any) { cb(this._node0, ctx); }
+  destroyInternal() { this._TreeComponent_0_4.destroyInternal(); }
+}
diff --git a/modules/benchmarks/src/tree/ng2_ftl/tree.ts b/modules/benchmarks/src/tree/ng2_ftl/tree.ts
new file mode 100644
index 000000000000..aef20567f45e
--- /dev/null
+++ b/modules/benchmarks/src/tree/ng2_ftl/tree.ts
@@ -0,0 +1,5 @@
+import {TreeNode, emptyTree} from '../util';
+
+export class TreeComponent { data: TreeNode = emptyTree; }
+
+export class AppModule {}
diff --git a/modules/benchmarks/src/tree/ng2_ftl/tree_host.ngfactory.ts b/modules/benchmarks/src/tree/ng2_ftl/tree_host.ngfactory.ts
new file mode 100644
index 000000000000..93545376f80c
--- /dev/null
+++ b/modules/benchmarks/src/tree/ng2_ftl/tree_host.ngfactory.ts
@@ -0,0 +1,65 @@
+/**
+ * This file is generated by the Angular 2 template compiler.
+ * Do not edit.
+ */
+/* tslint:disable */
+
+import * as import10 from '@angular/common/src/directives/ng_if';
+import * as import7 from '@angular/core/src/change_detection/change_detection';
+import * as import5 from '@angular/core/src/di/injector';
+import * as import9 from '@angular/core/src/linker/component_factory';
+import * as import2 from '@angular/core/src/linker/element';
+import * as import11 from '@angular/core/src/linker/template_ref';
+import * as import1 from '@angular/core/src/linker/view';
+import * as import6 from '@angular/core/src/linker/view_type';
+import * as import4 from '@angular/core/src/linker/view_utils';
+import * as import8 from '@angular/core/src/metadata/view';
+import * as import0 from '@angular/core/src/render/api';
+import * as import12 from '@angular/core/src/security';
+
+import * as import3 from './tree';
+import {_View_TreeComponent0} from './tree.ngfactory';
+
+var renderType_TreeComponent_Host: import0.RenderComponentType = (null as any);
+class _View_TreeComponent_Host0 extends import1.AppView<any> {
+  _el_0: any;
+  _vc_0: import2.AppElement;
+  _TreeComponent_0_4: _View_TreeComponent0;
+  constructor(
+      viewUtils: import4.ViewUtils, parentInjector: import5.Injector,
+      declarationEl: import2.AppElement) {
+    super(
+        _View_TreeComponent_Host0, renderType_TreeComponent_Host, import6.ViewType.HOST, viewUtils,
+        parentInjector, declarationEl, import7.ChangeDetectorStatus.CheckAlways);
+  }
+  createInternal(rootSelector: string): import2.AppElement {
+    this._el_0 = this.selectOrCreateHostElement('tree', rootSelector, (null as any));
+    this._vc_0 = new import2.AppElement(0, (null as any), this, this._el_0);
+    this._TreeComponent_0_4 = new _View_TreeComponent0(this._el_0);
+    this._vc_0.initComponent(this._TreeComponent_0_4.context, [], <any>this._TreeComponent_0_4);
+    this.init([].concat([this._el_0]), [this._el_0], [], []);
+    return this._vc_0;
+  }
+  detectChangesInternal(throwOnChange: boolean): void {
+    this._TreeComponent_0_4.detectChangesInternal(throwOnChange);
+  }
+  destroyInternal(): void { this._TreeComponent_0_4.destroyInternal(); }
+  injectorGetInternal(token: any, requestNodeIndex: number, notFoundResult: any): any {
+    if (((token === import3.TreeComponent) && (0 === requestNodeIndex))) {
+      return this._TreeComponent_0_4;
+    }
+    return notFoundResult;
+  }
+}
+function viewFactory_TreeComponent_Host0(
+    viewUtils: import4.ViewUtils, parentInjector: import5.Injector,
+    declarationEl: import2.AppElement): import1.AppView<any> {
+  if ((renderType_TreeComponent_Host === (null as any))) {
+    (renderType_TreeComponent_Host =
+         viewUtils.createRenderComponentType('', 0, import8.ViewEncapsulation.None, [], {}));
+  }
+  return new _View_TreeComponent_Host0(viewUtils, parentInjector, declarationEl);
+}
+export const TreeComponentNgFactory: import9.ComponentFactory<import3.TreeComponent> =
+    new import9.ComponentFactory<import3.TreeComponent>(
+        'tree', viewFactory_TreeComponent_Host0, import3.TreeComponent);
diff --git a/modules/benchmarks/src/tree/ng2_static_ftl/README.md b/modules/benchmarks/src/tree/ng2_static_ftl/README.md
new file mode 100644
index 000000000000..dc79ac2a192e
--- /dev/null
+++ b/modules/benchmarks/src/tree/ng2_static_ftl/README.md
@@ -0,0 +1,79 @@
+# Ng2 Static Faster Than BaseLine (FTL) Benchmark
+
+This benchmark was produced in the following way:
+
+1. Run AoT over the root component, one branch component
+   and the leaf component of the ng2_static benchmark
+2. Move all 3 component classes to `tree.ts`
+3. Add a `depth` property to the view factory constructor of
+   the `TreeBranchComponent` and pass it down to nested view factory calls
+   to be able to use the same view factory for all
+   nesting levels. This is just to make the experiment simpler to not
+   need to change so much code.
+4. Optimize the `tree_branch.ngfactory.ts` and `tree_leaf.ngfactory.ts`
+   (see below)
+
+The goal of this benchmark is to explore what kind of
+code the Ng2 compiler should generate in order to get faster.
+I.e. right now, the Ng2 compiler _does not_ produce this kind of code,
+but hopefully will in the future.
+
+## Optimizations and cleanups
+
+See `tree_branch.ngfactory.ts` and `tree_leaf.ngfactory.ts`.
+
+Performance:
+
+- remove view factory functions, call the constructor of the view class directly
+- remove `createInternal` and move the logic into the constructor
+- remove `AppView` parent class
+- generate direct calls to `detectChangesInternal` / `destroyInternal` of nested components
+- remove `Renderer` and `SanitizationService` to update
+   the dom directly via `document.createElement` / `element.appendChild` / setting
+   `Text.nodeValue` / `Element.style....`
+- remove `AppElement`
+- create component instance in view constructor
+
+Code size:
+- helper methods `createElementAndAppend` / `createTextAndAppend` / `createAnchorAndAppend`
+- wrap dirty check for `TreeComponent.data` into the method `updateData`
+  in the view class
+- remove `injectorGetInternal` assuming we can detect that nobody is injecting an `Injector`
+
+
+## Initial results: File size
+
+File size for view class of the component (without imports nor host view factory):
+* before: 81 LOC
+* after: 53 LOC
+
+## Initial results: Deep Tree Benchmark
+
+BENCHMARK deepTree....
+Description:
+- bundles: false
+- depth: 11
+- forceGc: false
+- regressionSlopeMetric: scriptTime
+- runId: f9ae32f0-8580-11e6-914d-9f4f8dbfb5e8
+- sampleSize: 20
+- userAgent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/53.0.2785.116 Safari/537.36
+
+...createOnly   |           gcAmount |             gcTime |        majorGcTime |     pureScriptTime |         renderTime |         scriptTime
+--------------- | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------
+ng2.static      |      10068.17+-33% |          9.50+-43% |          0.01+-84% |         83.01+-18% |         57.81+-19% |         92.33+-16%
+ng2.ftl         |       493.36+-435% |         0.65+-435% |         0.00+-435% |         28.48+-16% |          53.97+-7% |         28.48+-16%
+baseline        |        53.81+-435% |         0.10+-435% |         0.00+-435% |         19.79+-20% |         52.08+-19% |         19.89+-20%
+incremental_dom |       311.14+-254% |         2.43+-248% |         0.00+-207% |         68.30+-20% |         59.31+-19% |         70.73+-19%
+
+.....update     |           gcAmount |             gcTime |        majorGcTime |     pureScriptTime |         renderTime |         scriptTime
+--------------- | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------
+ng2.static      |               0.00 |               0.00 |               0.00 |         24.65+-12% |         31.43+-22% |         24.65+-12%
+ng2.ftl         |               0.00 |         0.00+-435% |         0.00+-435% |         16.02+-13% |          29.15+-9% |         16.02+-13%
+baseline        |       509.97+-176% |         0.65+-269% |         0.40+-434% |         28.32+-16% |         35.80+-33% |         28.32+-16%
+incremental_dom |       961.48+-246% |         0.52+-311% |         0.31+-435% |         28.94+-19% |         36.13+-21% |         28.94+-19%
+
+Ratios (create, pureScriptTime)
+- 2.9x faster than current implementation
+- 2.3x faster than incremental dom
+- 1.4x slower than baseline
diff --git a/modules/benchmarks/src/tree/ng2_static_ftl/app.ngfactory.ts b/modules/benchmarks/src/tree/ng2_static_ftl/app.ngfactory.ts
new file mode 100644
index 000000000000..c4214df11cc2
--- /dev/null
+++ b/modules/benchmarks/src/tree/ng2_static_ftl/app.ngfactory.ts
@@ -0,0 +1,319 @@
+/**
+ * This file is generated by the Angular 2 template compiler.
+ * Do not edit.
+ */
+/* tslint:disable */
+
+import * as import2 from '@angular/common/src/common_module';
+import * as import5 from '@angular/common/src/localization';
+import * as import6 from '@angular/core/src/application_init';
+import * as import3 from '@angular/core/src/application_module';
+import * as import8 from '@angular/core/src/application_ref';
+import * as import19 from '@angular/core/src/application_tokens';
+import * as import31 from '@angular/core/src/change_detection/differs/iterable_differs';
+import * as import32 from '@angular/core/src/change_detection/differs/keyvalue_differs';
+import * as import24 from '@angular/core/src/console';
+import * as import17 from '@angular/core/src/di/injector';
+import * as import26 from '@angular/core/src/error_handler';
+import * as import33 from '@angular/core/src/i18n/tokens';
+import * as import25 from '@angular/core/src/i18n/tokens';
+import * as import9 from '@angular/core/src/linker/compiler';
+import * as import0 from '@angular/core/src/linker/ng_module_factory';
+import * as import15 from '@angular/core/src/linker/view_utils';
+import * as import29 from '@angular/core/src/render/api';
+import * as import30 from '@angular/core/src/security';
+import * as import7 from '@angular/core/src/testability/testability';
+import * as import22 from '@angular/core/src/zone/ng_zone';
+import * as import4 from '@angular/platform-browser/src/browser';
+import * as import16 from '@angular/platform-browser/src/browser/title';
+import * as import28 from '@angular/platform-browser/src/dom/animation_driver';
+import * as import23 from '@angular/platform-browser/src/dom/debug/ng_probe';
+import * as import13 from '@angular/platform-browser/src/dom/dom_renderer';
+import * as import27 from '@angular/platform-browser/src/dom/dom_tokens';
+import * as import20 from '@angular/platform-browser/src/dom/events/dom_events';
+import * as import11 from '@angular/platform-browser/src/dom/events/event_manager';
+import * as import10 from '@angular/platform-browser/src/dom/events/hammer_gestures';
+import * as import21 from '@angular/platform-browser/src/dom/events/key_events';
+import * as import12 from '@angular/platform-browser/src/dom/shared_styles_host';
+import * as import14 from '@angular/platform-browser/src/security/dom_sanitization_service';
+
+import * as import1 from './app';
+import * as import18 from './tree_root.ngfactory';
+
+class AppModuleInjector extends import0.NgModuleInjector<import1.AppModule> {
+  _CommonModule_0: import2.CommonModule;
+  _ApplicationModule_1: import3.ApplicationModule;
+  _BrowserModule_2: import4.BrowserModule;
+  _AppModule_3: import1.AppModule;
+  __LOCALE_ID_4: any;
+  __NgLocalization_5: import5.NgLocaleLocalization;
+  _ErrorHandler_6: any;
+  _ApplicationInitStatus_7: import6.ApplicationInitStatus;
+  _Testability_8: import7.Testability;
+  _ApplicationRef__9: import8.ApplicationRef_;
+  __ApplicationRef_10: any;
+  __Compiler_11: import9.Compiler;
+  __APP_ID_12: any;
+  __DOCUMENT_13: any;
+  __HAMMER_GESTURE_CONFIG_14: import10.HammerGestureConfig;
+  __EVENT_MANAGER_PLUGINS_15: any[];
+  __EventManager_16: import11.EventManager;
+  __DomSharedStylesHost_17: import12.DomSharedStylesHost;
+  __AnimationDriver_18: any;
+  __DomRootRenderer_19: import13.DomRootRenderer_;
+  __RootRenderer_20: any;
+  __DomSanitizer_21: import14.DomSanitizerImpl;
+  __Sanitizer_22: any;
+  __ViewUtils_23: import15.ViewUtils;
+  __IterableDiffers_24: any;
+  __KeyValueDiffers_25: any;
+  __SharedStylesHost_26: any;
+  __Title_27: import16.Title;
+  __TRANSLATIONS_FORMAT_28: any;
+  constructor(parent: import17.Injector) {
+    super(parent, [import18.TreeRootComponentNgFactory], [import18.TreeRootComponentNgFactory]);
+  }
+  get _LOCALE_ID_4(): any {
+    if ((this.__LOCALE_ID_4 == (null as any))) {
+      (this.__LOCALE_ID_4 = (null as any));
+    }
+    return this.__LOCALE_ID_4;
+  }
+  get _NgLocalization_5(): import5.NgLocaleLocalization {
+    if ((this.__NgLocalization_5 == (null as any))) {
+      (this.__NgLocalization_5 = new import5.NgLocaleLocalization(this._LOCALE_ID_4));
+    }
+    return this.__NgLocalization_5;
+  }
+  get _ApplicationRef_10(): any {
+    if ((this.__ApplicationRef_10 == (null as any))) {
+      (this.__ApplicationRef_10 = this._ApplicationRef__9);
+    }
+    return this.__ApplicationRef_10;
+  }
+  get _Compiler_11(): import9.Compiler {
+    if ((this.__Compiler_11 == (null as any))) {
+      (this.__Compiler_11 = new import9.Compiler());
+    }
+    return this.__Compiler_11;
+  }
+  get _APP_ID_12(): any {
+    if ((this.__APP_ID_12 == (null as any))) {
+      (this.__APP_ID_12 = import19._appIdRandomProviderFactory());
+    }
+    return this.__APP_ID_12;
+  }
+  get _DOCUMENT_13(): any {
+    if ((this.__DOCUMENT_13 == (null as any))) {
+      (this.__DOCUMENT_13 = import4._document());
+    }
+    return this.__DOCUMENT_13;
+  }
+  get _HAMMER_GESTURE_CONFIG_14(): import10.HammerGestureConfig {
+    if ((this.__HAMMER_GESTURE_CONFIG_14 == (null as any))) {
+      (this.__HAMMER_GESTURE_CONFIG_14 = new import10.HammerGestureConfig());
+    }
+    return this.__HAMMER_GESTURE_CONFIG_14;
+  }
+  get _EVENT_MANAGER_PLUGINS_15(): any[] {
+    if ((this.__EVENT_MANAGER_PLUGINS_15 == (null as any))) {
+      (this.__EVENT_MANAGER_PLUGINS_15 = [
+        new import20.DomEventsPlugin(), new import21.KeyEventsPlugin(),
+        new import10.HammerGesturesPlugin(this._HAMMER_GESTURE_CONFIG_14)
+      ]);
+    }
+    return this.__EVENT_MANAGER_PLUGINS_15;
+  }
+  get _EventManager_16(): import11.EventManager {
+    if ((this.__EventManager_16 == (null as any))) {
+      (this.__EventManager_16 = new import11.EventManager(
+           this._EVENT_MANAGER_PLUGINS_15, this.parent.get(import22.NgZone)));
+    }
+    return this.__EventManager_16;
+  }
+  get _DomSharedStylesHost_17(): import12.DomSharedStylesHost {
+    if ((this.__DomSharedStylesHost_17 == (null as any))) {
+      (this.__DomSharedStylesHost_17 = new import12.DomSharedStylesHost(this._DOCUMENT_13));
+    }
+    return this.__DomSharedStylesHost_17;
+  }
+  get _AnimationDriver_18(): any {
+    if ((this.__AnimationDriver_18 == (null as any))) {
+      (this.__AnimationDriver_18 = import4._resolveDefaultAnimationDriver());
+    }
+    return this.__AnimationDriver_18;
+  }
+  get _DomRootRenderer_19(): import13.DomRootRenderer_ {
+    if ((this.__DomRootRenderer_19 == (null as any))) {
+      (this.__DomRootRenderer_19 = new import13.DomRootRenderer_(
+           this._DOCUMENT_13, this._EventManager_16, this._DomSharedStylesHost_17,
+           this._AnimationDriver_18));
+    }
+    return this.__DomRootRenderer_19;
+  }
+  get _RootRenderer_20(): any {
+    if ((this.__RootRenderer_20 == (null as any))) {
+      (this.__RootRenderer_20 = import23._createConditionalRootRenderer(
+           this._DomRootRenderer_19, this.parent.get(import23.NgProbeToken, (null as any))));
+    }
+    return this.__RootRenderer_20;
+  }
+  get _DomSanitizer_21(): import14.DomSanitizerImpl {
+    if ((this.__DomSanitizer_21 == (null as any))) {
+      (this.__DomSanitizer_21 = new import14.DomSanitizerImpl());
+    }
+    return this.__DomSanitizer_21;
+  }
+  get _Sanitizer_22(): any {
+    if ((this.__Sanitizer_22 == (null as any))) {
+      (this.__Sanitizer_22 = this._DomSanitizer_21);
+    }
+    return this.__Sanitizer_22;
+  }
+  get _ViewUtils_23(): import15.ViewUtils {
+    if ((this.__ViewUtils_23 == (null as any))) {
+      (this.__ViewUtils_23 =
+           new import15.ViewUtils(this._RootRenderer_20, this._APP_ID_12, this._Sanitizer_22));
+    }
+    return this.__ViewUtils_23;
+  }
+  get _IterableDiffers_24(): any {
+    if ((this.__IterableDiffers_24 == (null as any))) {
+      (this.__IterableDiffers_24 = import3._iterableDiffersFactory());
+    }
+    return this.__IterableDiffers_24;
+  }
+  get _KeyValueDiffers_25(): any {
+    if ((this.__KeyValueDiffers_25 == (null as any))) {
+      (this.__KeyValueDiffers_25 = import3._keyValueDiffersFactory());
+    }
+    return this.__KeyValueDiffers_25;
+  }
+  get _SharedStylesHost_26(): any {
+    if ((this.__SharedStylesHost_26 == (null as any))) {
+      (this.__SharedStylesHost_26 = this._DomSharedStylesHost_17);
+    }
+    return this.__SharedStylesHost_26;
+  }
+  get _Title_27(): import16.Title {
+    if ((this.__Title_27 == (null as any))) {
+      (this.__Title_27 = new import16.Title());
+    }
+    return this.__Title_27;
+  }
+  get _TRANSLATIONS_FORMAT_28(): any {
+    if ((this.__TRANSLATIONS_FORMAT_28 == (null as any))) {
+      (this.__TRANSLATIONS_FORMAT_28 = (null as any));
+    }
+    return this.__TRANSLATIONS_FORMAT_28;
+  }
+  createInternal(): import1.AppModule {
+    this._CommonModule_0 = new import2.CommonModule();
+    this._ApplicationModule_1 = new import3.ApplicationModule();
+    this._BrowserModule_2 =
+        new import4.BrowserModule(this.parent.get(import4.BrowserModule, (null as any)));
+    this._AppModule_3 = new import1.AppModule();
+    this._ErrorHandler_6 = import4.errorHandler();
+    this._ApplicationInitStatus_7 =
+        new import6.ApplicationInitStatus(this.parent.get(import6.APP_INITIALIZER, (null as any)));
+    this._Testability_8 = new import7.Testability(this.parent.get(import22.NgZone));
+    this._ApplicationRef__9 = new import8.ApplicationRef_(
+        this.parent.get(import22.NgZone), this.parent.get(import24.Console), this,
+        this._ErrorHandler_6, this, this._ApplicationInitStatus_7,
+        this.parent.get(import7.TestabilityRegistry, (null as any)), this._Testability_8);
+    return this._AppModule_3;
+  }
+  getInternal(token: any, notFoundResult: any): any {
+    if ((token === import2.CommonModule)) {
+      return this._CommonModule_0;
+    }
+    if ((token === import3.ApplicationModule)) {
+      return this._ApplicationModule_1;
+    }
+    if ((token === import4.BrowserModule)) {
+      return this._BrowserModule_2;
+    }
+    if ((token === import1.AppModule)) {
+      return this._AppModule_3;
+    }
+    if ((token === import25.LOCALE_ID)) {
+      return this._LOCALE_ID_4;
+    }
+    if ((token === import5.NgLocalization)) {
+      return this._NgLocalization_5;
+    }
+    if ((token === import26.ErrorHandler)) {
+      return this._ErrorHandler_6;
+    }
+    if ((token === import6.ApplicationInitStatus)) {
+      return this._ApplicationInitStatus_7;
+    }
+    if ((token === import7.Testability)) {
+      return this._Testability_8;
+    }
+    if ((token === import8.ApplicationRef_)) {
+      return this._ApplicationRef__9;
+    }
+    if ((token === import8.ApplicationRef)) {
+      return this._ApplicationRef_10;
+    }
+    if ((token === import9.Compiler)) {
+      return this._Compiler_11;
+    }
+    if ((token === import19.APP_ID)) {
+      return this._APP_ID_12;
+    }
+    if ((token === import27.DOCUMENT)) {
+      return this._DOCUMENT_13;
+    }
+    if ((token === import10.HAMMER_GESTURE_CONFIG)) {
+      return this._HAMMER_GESTURE_CONFIG_14;
+    }
+    if ((token === import11.EVENT_MANAGER_PLUGINS)) {
+      return this._EVENT_MANAGER_PLUGINS_15;
+    }
+    if ((token === import11.EventManager)) {
+      return this._EventManager_16;
+    }
+    if ((token === import12.DomSharedStylesHost)) {
+      return this._DomSharedStylesHost_17;
+    }
+    if ((token === import28.AnimationDriver)) {
+      return this._AnimationDriver_18;
+    }
+    if ((token === import13.DomRootRenderer)) {
+      return this._DomRootRenderer_19;
+    }
+    if ((token === import29.RootRenderer)) {
+      return this._RootRenderer_20;
+    }
+    if ((token === import14.DomSanitizer)) {
+      return this._DomSanitizer_21;
+    }
+    if ((token === import30.Sanitizer)) {
+      return this._Sanitizer_22;
+    }
+    if ((token === import15.ViewUtils)) {
+      return this._ViewUtils_23;
+    }
+    if ((token === import31.IterableDiffers)) {
+      return this._IterableDiffers_24;
+    }
+    if ((token === import32.KeyValueDiffers)) {
+      return this._KeyValueDiffers_25;
+    }
+    if ((token === import12.SharedStylesHost)) {
+      return this._SharedStylesHost_26;
+    }
+    if ((token === import16.Title)) {
+      return this._Title_27;
+    }
+    if ((token === import33.TRANSLATIONS_FORMAT)) {
+      return this._TRANSLATIONS_FORMAT_28;
+    }
+    return notFoundResult;
+  }
+  destroyInternal(): void { this._ApplicationRef__9.ngOnDestroy(); }
+}
+export const AppModuleNgFactory: import0.NgModuleFactory<import1.AppModule> =
+    new import0.NgModuleFactory(AppModuleInjector, import1.AppModule);
\ No newline at end of file
diff --git a/modules/benchmarks/src/tree/ng2_static_ftl/app.ts b/modules/benchmarks/src/tree/ng2_static_ftl/app.ts
new file mode 100644
index 000000000000..218010265c2e
--- /dev/null
+++ b/modules/benchmarks/src/tree/ng2_static_ftl/app.ts
@@ -0,0 +1 @@
+export class AppModule {}
diff --git a/modules/benchmarks/src/tree/ng2_static_ftl/ftl_util.ts b/modules/benchmarks/src/tree/ng2_static_ftl/ftl_util.ts
new file mode 100644
index 000000000000..9434a049fa7b
--- /dev/null
+++ b/modules/benchmarks/src/tree/ng2_static_ftl/ftl_util.ts
@@ -0,0 +1,17 @@
+export function createElementAndAppend(parent: any, name: string) {
+  const el = document.createElement(name);
+  parent.appendChild(el);
+  return el;
+}
+
+export function createTextAndAppend(parent: any) {
+  const txt = document.createTextNode('');
+  parent.appendChild(txt);
+  return txt;
+}
+
+export function createAnchorAndAppend(parent: any) {
+  const txt = document.createComment('');
+  parent.appendChild(txt);
+  return txt;
+}
\ No newline at end of file
diff --git a/modules/benchmarks/src/tree/ng2_static_ftl/index.html b/modules/benchmarks/src/tree/ng2_static_ftl/index.html
new file mode 100644
index 000000000000..7edd41a68c90
--- /dev/null
+++ b/modules/benchmarks/src/tree/ng2_static_ftl/index.html
@@ -0,0 +1,26 @@
+<!doctype html>
+<html>
+<body>
+  <h2>Params</h2>
+  <form>
+    Depth:
+    <input type="number" name="depth" placeholder="depth" value="9">
+    <br>
+    <button>Apply</button>
+  </form>
+
+  <h2>Ng2 Static FTL Tree Benchmark</h2>
+  <p>
+    <button id="destroyDom">destroyDom</button>
+    <button id="createDom">createDom</button>
+    <button id="updateDomProfile">profile updateDom</button>
+    <button id="createDomProfile">profile createDom</button>
+  </p>
+
+  <div>
+    <tree id="root"></tree>
+  </div>
+
+  <script src="../../bootstrap_ng2.js"></script>
+</body>
+</html>
\ No newline at end of file
diff --git a/modules/benchmarks/src/tree/ng2_static_ftl/index.ts b/modules/benchmarks/src/tree/ng2_static_ftl/index.ts
new file mode 100644
index 000000000000..f07c63c49374
--- /dev/null
+++ b/modules/benchmarks/src/tree/ng2_static_ftl/index.ts
@@ -0,0 +1,41 @@
+import {ApplicationRef, NgModule, enableProdMode} from '@angular/core';
+import {platformBrowser} from '@angular/platform-browser';
+
+import {bindAction, profile} from '../../util';
+import {TreeNode, buildTree, emptyTree} from '../util';
+
+import {AppModuleNgFactory} from './app.ngfactory';
+import {TreeRootComponent} from './tree';
+
+export function main() {
+  let tree: TreeRootComponent;
+  let appRef: ApplicationRef;
+
+  function destroyDom() {
+    tree.data = emptyTree;
+    appRef.tick();
+  }
+
+  function createDom() {
+    tree.data = buildTree();
+    appRef.tick();
+  }
+
+  function noop() {}
+
+  function init() {
+    enableProdMode();
+    platformBrowser().bootstrapModuleFactory(AppModuleNgFactory).then((ref) => {
+      const injector = ref.injector;
+      appRef = injector.get(ApplicationRef);
+
+      tree = appRef.components[0].instance;
+      bindAction('#destroyDom', destroyDom);
+      bindAction('#createDom', createDom);
+      bindAction('#updateDomProfile', profile(createDom, noop, 'update'));
+      bindAction('#createDomProfile', profile(createDom, destroyDom, 'create'));
+    });
+  }
+
+  init();
+}
diff --git a/modules/benchmarks/src/tree/ng2_static_ftl/tree.ts b/modules/benchmarks/src/tree/ng2_static_ftl/tree.ts
new file mode 100644
index 000000000000..431f1331c8eb
--- /dev/null
+++ b/modules/benchmarks/src/tree/ng2_static_ftl/tree.ts
@@ -0,0 +1,7 @@
+import {TreeNode, emptyTree} from '../util';
+
+export class TreeRootComponent { data: TreeNode = emptyTree; }
+
+export class TreeBranchComponent { data: TreeNode; }
+
+export class TreeLeafComponent { data: TreeNode; }
diff --git a/modules/benchmarks/src/tree/ng2_static_ftl/tree_branch.ngfactory.ts b/modules/benchmarks/src/tree/ng2_static_ftl/tree_branch.ngfactory.ts
new file mode 100644
index 000000000000..4af60aa48471
--- /dev/null
+++ b/modules/benchmarks/src/tree/ng2_static_ftl/tree_branch.ngfactory.ts
@@ -0,0 +1,76 @@
+/**
+ * This file is hand tweeked based on
+ * the out put of the Angular 2 template compiler
+ * and then hand tweeked to show possible future output.
+ */
+/* tslint:disable */
+
+import * as import7 from '@angular/core/src/change_detection/change_detection';
+import * as import5 from '@angular/core/src/di/injector';
+import * as import9 from '@angular/core/src/linker/component_factory';
+import * as import2 from '@angular/core/src/linker/element';
+import * as import1 from '@angular/core/src/linker/view';
+import * as import6 from '@angular/core/src/linker/view_type';
+import * as import4 from '@angular/core/src/linker/view_utils';
+import * as import8 from '@angular/core/src/metadata/view';
+import * as import0 from '@angular/core/src/render/api';
+import * as import12 from '@angular/core/src/security';
+
+import {createAnchorAndAppend, createElementAndAppend, createTextAndAppend} from './ftl_util';
+import * as import3 from './tree';
+import * as import11 from './tree_leaf.ngfactory';
+
+export class View_TreeTreeComponent {
+  context: import3.TreeBranchComponent;
+  ref: any;
+  _el_0: any;
+  _text_1: any;
+  _el_2: any;
+  _TreeComponent20_2_4View: any;
+  _el_3: any;
+  _TreeComponent20_3_4View: any;
+  /*private*/ _expr_0: any;
+  /*private*/ _expr_1: any;
+  /*private*/ _expr_2: any;
+  constructor(depth: number, parentRenderNode: any) {
+    this.context = new import3.TreeBranchComponent();
+    this._el_0 = createElementAndAppend(parentRenderNode, 'span');
+    this._text_1 = createTextAndAppend(this._el_0);
+    this._el_2 = createElementAndAppend(parentRenderNode, 'tree');
+    this._TreeComponent20_2_4View = depth > 0 ? new View_TreeTreeComponent(depth - 1, this._el_2) :
+                                                new import11.View_TreeLeafComponent(this._el_2);
+    this._el_3 = createElementAndAppend(parentRenderNode, 'tree');
+    this._TreeComponent20_3_4View = depth > 0 ? new View_TreeTreeComponent(depth - 1, this._el_3) :
+                                                new import11.View_TreeLeafComponent(this._el_3);
+    this._expr_0 = import7.UNINITIALIZED;
+    this._expr_1 = import7.UNINITIALIZED;
+    this._expr_2 = import7.UNINITIALIZED;
+  }
+  destroyInternal() {
+    this._TreeComponent20_2_4View.destroyInternal();
+    this._TreeComponent20_3_4View.destroyInternal();
+  }
+  updateData(currVal_2: any) {
+    if (import4.checkBinding(false, this._expr_2, currVal_2)) {
+      this.context.data = currVal_2;
+      this._expr_2 = currVal_2;
+    }
+  }
+  detectChangesInternal(throwOnChange: boolean): void {
+    this._TreeComponent20_2_4View.updateData(this.context.data.right);
+    this._TreeComponent20_3_4View.updateData(this.context.data.left);
+
+    const currVal_0: any = ((this.context.data.depth % 2) ? '' : 'grey');
+    if (import4.checkBinding(throwOnChange, this._expr_0, currVal_0)) {
+      this._el_0.style.backgroundColor = currVal_0;
+      this._expr_0 = currVal_0;
+    }
+    const currVal_1: any = import4.interpolate(1, ' ', this.context.data.value, ' ');
+    if (import4.checkBinding(throwOnChange, this._expr_1, currVal_1)) {
+      this._text_1.nodeValue = currVal_1;
+      this._expr_1 = currVal_1;
+    }
+    this._TreeComponent20_2_4View.detectChangesInternal(throwOnChange);
+    this._TreeComponent20_3_4View.detectChangesInternal(throwOnChange);
+  }
+}
diff --git a/modules/benchmarks/src/tree/ng2_static_ftl/tree_leaf.ngfactory.ts b/modules/benchmarks/src/tree/ng2_static_ftl/tree_leaf.ngfactory.ts
new file mode 100644
index 000000000000..f272eb29f5c8
--- /dev/null
+++ b/modules/benchmarks/src/tree/ng2_static_ftl/tree_leaf.ngfactory.ts
@@ -0,0 +1,56 @@
+/**
+ * This file is hand tweeked based on
+ * the out put of the Angular 2 template compiler
+ * and then hand tweeked to show possible future output.
+ */
+/* tslint:disable */
+
+import * as import7 from '@angular/core/src/change_detection/change_detection';
+import * as import5 from '@angular/core/src/di/injector';
+import * as import9 from '@angular/core/src/linker/component_factory';
+import * as import2 from '@angular/core/src/linker/element';
+import * as import1 from '@angular/core/src/linker/view';
+import * as import6 from '@angular/core/src/linker/view_type';
+import * as import4 from '@angular/core/src/linker/view_utils';
+import * as import8 from '@angular/core/src/metadata/view';
+import * as import0 from '@angular/core/src/render/api';
+import * as import10 from '@angular/core/src/security';
+
+import * as import3 from './tree';
+
+export class View_TreeLeafComponent {
+  context: import3.TreeLeafComponent;
+  _el_0: any;
+  _text_1: any;
+  /*private*/ _expr_0: any;
+  /*private*/ _expr_1: any;
+  /*private*/ _expr_2: any;
+  constructor(parentRenderNode: any) {
+    this.context = new import3.TreeLeafComponent();
+    this._el_0 = document.createElement('span');
+    parentRenderNode.appendChild(this._el_0);
+    this._text_1 = document.createTextNode('');
+    this._el_0.appendChild(this._text_1);
+    this._expr_0 = import7.UNINITIALIZED;
+    this._expr_1 = import7.UNINITIALIZED;
+  }
+  updateData(currVal_2: any) {
+    if (import4.checkBinding(false, this._expr_2, currVal_2)) {
+      this.context.data = currVal_2;
+      this._expr_2 = currVal_2;
+    }
+  }
+  destroyInternal() {}
+  detectChangesInternal(throwOnChange: boolean): void {
+    const currVal_0: any = ((this.context.data.depth % 2) ? '' : 'grey');
+    if (import4.checkBinding(throwOnChange, this._expr_0, currVal_0)) {
+      this._el_0.style.backgroundColor = currVal_0;
+      this._expr_0 = currVal_0;
+    }
+    const currVal_1: any = import4.interpolate(1, ' ', this.context.data.value, ' ');
+    if (import4.checkBinding(throwOnChange, this._expr_1, currVal_1)) {
+      this._text_1.nodeValue = currVal_1;
+      this._expr_1 = currVal_1;
+    }
+  }
+}
diff --git a/modules/benchmarks/src/tree/ng2_static_ftl/tree_root.ngfactory.ts b/modules/benchmarks/src/tree/ng2_static_ftl/tree_root.ngfactory.ts
new file mode 100644
index 000000000000..18d11c830cdf
--- /dev/null
+++ b/modules/benchmarks/src/tree/ng2_static_ftl/tree_root.ngfactory.ts
@@ -0,0 +1,150 @@
+/**
+ * This file is generated by the Angular 2 template compiler.
+ * Do not edit.
+ */
+/* tslint:disable */
+
+import * as import10 from '@angular/common/src/directives/ng_if';
+import * as import7 from '@angular/core/src/change_detection/change_detection';
+import * as import5 from '@angular/core/src/di/injector';
+import * as import9 from '@angular/core/src/linker/component_factory';
+import * as import2 from '@angular/core/src/linker/element';
+import * as import11 from '@angular/core/src/linker/template_ref';
+import * as import1 from '@angular/core/src/linker/view';
+import * as import6 from '@angular/core/src/linker/view_type';
+import * as import4 from '@angular/core/src/linker/view_utils';
+import * as import8 from '@angular/core/src/metadata/view';
+import * as import0 from '@angular/core/src/render/api';
+
+import {maxDepth} from '../util';
+
+import * as import3 from './tree';
+import * as import12 from './tree';
+import * as import13 from './tree_branch.ngfactory';
+
+var renderType_TreeRootComponent_Host: import0.RenderComponentType = (null as any);
+class _View_TreeRootComponent_Host0 extends import1.AppView<any> {
+  _el_0: any;
+  /*private*/ _appEl_0: import2.AppElement;
+  _TreeRootComponent_0_4: import3.TreeRootComponent;
+  constructor(
+      viewUtils: import4.ViewUtils, parentInjector: import5.Injector,
+      declarationEl: import2.AppElement) {
+    super(
+        _View_TreeRootComponent_Host0, renderType_TreeRootComponent_Host, import6.ViewType.HOST,
+        viewUtils, parentInjector, declarationEl, import7.ChangeDetectorStatus.CheckAlways);
+  }
+  createInternal(rootSelector: string): import2.AppElement {
+    this._el_0 = this.selectOrCreateHostElement('tree', rootSelector, (null as any));
+    this._appEl_0 = new import2.AppElement(0, (null as any), this, this._el_0);
+    var compView_0: any =
+        viewFactory_TreeRootComponent0(this.viewUtils, this.injector(0), this._appEl_0);
+    this._TreeRootComponent_0_4 = new import3.TreeRootComponent();
+    this._appEl_0.initComponent(this._TreeRootComponent_0_4, [], compView_0);
+    compView_0.create(this._TreeRootComponent_0_4, this.projectableNodes, (null as any));
+    this.init([].concat([this._el_0]), [this._el_0], [], []);
+    return this._appEl_0;
+  }
+  injectorGetInternal(token: any, requestNodeIndex: number, notFoundResult: any): any {
+    if (((token === import3.TreeRootComponent) && (0 === requestNodeIndex))) {
+      return this._TreeRootComponent_0_4;
+    }
+    return notFoundResult;
+  }
+}
+function viewFactory_TreeRootComponent_Host0(
+    viewUtils: import4.ViewUtils, parentInjector: import5.Injector,
+    declarationEl: import2.AppElement): import1.AppView<any> {
+  if ((renderType_TreeRootComponent_Host === (null as any))) {
+    (renderType_TreeRootComponent_Host =
+         viewUtils.createRenderComponentType('', 0, import8.ViewEncapsulation.None, [], {}));
+  }
+  return new _View_TreeRootComponent_Host0(viewUtils, parentInjector, declarationEl);
+}
+export const TreeRootComponentNgFactory: import9.ComponentFactory<import3.TreeRootComponent> =
+    new import9.ComponentFactory<import3.TreeRootComponent>(
+        'tree', viewFactory_TreeRootComponent_Host0, import3.TreeRootComponent);
+const styles_TreeRootComponent: any[] = [];
+var renderType_TreeRootComponent: import0.RenderComponentType = (null as any);
+class _View_TreeRootComponent0 extends import1.AppView<import3.TreeRootComponent> {
+  _anchor_0: any;
+  /*private*/ _appEl_0: import2.AppElement;
+  _TemplateRef_0_5: any;
+  _NgIf_0_6: import10.NgIf;
+  /*private*/ _expr_0: any;
+  constructor(
+      viewUtils: import4.ViewUtils, parentInjector: import5.Injector,
+      declarationEl: import2.AppElement) {
+    super(
+        _View_TreeRootComponent0, renderType_TreeRootComponent, import6.ViewType.COMPONENT,
+        viewUtils, parentInjector, declarationEl, import7.ChangeDetectorStatus.CheckAlways);
+  }
+  createInternal(rootSelector: string): import2.AppElement {
+    const parentRenderNode: any =
+        this.renderer.createViewRoot(this.declarationAppElement.nativeElement);
+    this._anchor_0 = this.renderer.createTemplateAnchor(parentRenderNode, (null as any));
+    this._appEl_0 = new import2.AppElement(0, (null as any), this, this._anchor_0);
+    this._TemplateRef_0_5 =
+        new import11.TemplateRef_(this._appEl_0, viewFactory_TreeRootComponent1);
+    this._NgIf_0_6 = new import10.NgIf(this._appEl_0.vcRef, this._TemplateRef_0_5);
+    this._expr_0 = import7.UNINITIALIZED;
+    this.init([], [this._anchor_0], [], []);
+    return (null as any);
+  }
+  injectorGetInternal(token: any, requestNodeIndex: number, notFoundResult: any): any {
+    if (((token === import11.TemplateRef) && (0 === requestNodeIndex))) {
+      return this._TemplateRef_0_5;
+    }
+    if (((token === import10.NgIf) && (0 === requestNodeIndex))) {
+      return this._NgIf_0_6;
+    }
+    return notFoundResult;
+  }
+  detectChangesInternal(throwOnChange: boolean): void {
+    const currVal_0: any = (this.context.data.left != (null as any));
+    if (import4.checkBinding(throwOnChange, this._expr_0, currVal_0)) {
+      this._NgIf_0_6.ngIf = currVal_0;
+      this._expr_0 = currVal_0;
+    }
+    this.detectContentChildrenChanges(throwOnChange);
+    this.detectViewChildrenChanges(throwOnChange);
+  }
+}
+export function viewFactory_TreeRootComponent0(
+    viewUtils: import4.ViewUtils, parentInjector: import5.Injector,
+    declarationEl: import2.AppElement): import1.AppView<import3.TreeRootComponent> {
+  if ((renderType_TreeRootComponent === (null as any))) {
+    (renderType_TreeRootComponent = viewUtils.createRenderComponentType(
+         '/Users/tbosch/projects/conf-demos/ngc-demo/src/ng2_static/root_tree.ts class TreeRootComponent - inline template',
+         0, import8.ViewEncapsulation.None, styles_TreeRootComponent, {}));
+  }
+  return new _View_TreeRootComponent0(viewUtils, parentInjector, declarationEl);
+}
+class _View_TreeRootComponent1 extends import1.AppView<any> {
+  _el_0: any;
+  _TreeComponent0_0_4View: any;
+  constructor(
+      viewUtils: import4.ViewUtils, parentInjector: import5.Injector,
+      declarationEl: import2.AppElement) {
+    super(
+        _View_TreeRootComponent1, renderType_TreeRootComponent, import6.ViewType.EMBEDDED,
+        viewUtils, parentInjector, declarationEl, import7.ChangeDetectorStatus.CheckAlways);
+  }
+  createInternal(rootSelector: string): import2.AppElement {
+    this._el_0 = this.renderer.createElement((null as any), 'tree0', (null as any));
+    this._TreeComponent0_0_4View = new import13.View_TreeTreeComponent(maxDepth - 1, this._el_0);
+    this.init([].concat([this._el_0]), [this._el_0], [], []);
+    return (null as any);
+  }
+  destroyInternal() { this._TreeComponent0_0_4View.destroyInternal(); }
+  detectChangesInternal(throwOnChange: boolean): void {
+    this._TreeComponent0_0_4View.updateData(this.parent.context.data);
+    this.detectContentChildrenChanges(throwOnChange);
+    this._TreeComponent0_0_4View.detectChangesInternal(throwOnChange);
+  }
+}
+function viewFactory_TreeRootComponent1(
+    viewUtils: import4.ViewUtils, parentInjector: import5.Injector,
+    declarationEl: import2.AppElement): import1.AppView<any> {
+  return new _View_TreeRootComponent1(viewUtils, parentInjector, declarationEl);
+}
\ No newline at end of file
diff --git a/modules/e2e_util/e2e_util.ts b/modules/e2e_util/e2e_util.ts
index 5218716d6401..394b21eabb29 100644
--- a/modules/e2e_util/e2e_util.ts
+++ b/modules/e2e_util/e2e_util.ts
@@ -34,7 +34,9 @@ export function openBrowser(config: {
     browser.ignoreSynchronization = true;
   }
   var params = config.params || [];
-  params = params.concat([{name: 'bundles', value: cmdArgs.bundles}]);
+  if (!params.some((param) => param.name === 'bundles')) {
+    params = params.concat([{name: 'bundles', value: cmdArgs.bundles}]);
+  }
 
   var urlParams: string[] = [];
   params.forEach((param) => { urlParams.push(param.name + '=' + param.value); });

From b39d3a173e7ec2047d33ea773599fac646ac1285 Mon Sep 17 00:00:00 2001
From: Alex Eagle <eagle@post.harvard.edu>
Date: Fri, 30 Sep 2016 09:26:53 -0700
Subject: [PATCH 36/70] refactor(facade): Inline isBlank called with
 object-type argument (#11992)

---
 .../benchpress/src/web_driver_extension.ts    |  3 +--
 .../src/webdriver/ios_driver_extension.ts     |  2 +-
 .../test/metric/perflog_metric_spec.ts        |  6 ++---
 .../test/metric/user_metric_spec.ts           |  5 ++--
 .../test/reporter/console_reporter_spec.ts    |  2 +-
 .../@angular/benchpress/test/runner_spec.ts   |  3 +--
 .../@angular/benchpress/test/sampler_spec.ts  |  4 ++--
 .../webdriver/chrome_driver_extension_spec.ts |  2 +-
 .../webdriver/ios_driver_extension_spec.ts    |  6 ++---
 .../common/test/pipes/async_pipe_spec.ts      |  3 +--
 .../test/static_reflector_spec.ts             |  2 +-
 .../src/animation/animation_compiler.ts       |  4 ++--
 .../@angular/compiler/src/ml_parser/parser.ts |  4 ++--
 .../compiler/src/ng_module_compiler.ts        |  8 +++----
 .../compiler/src/output/output_ast.ts         |  8 +++----
 .../compiler/src/provider_analyzer.ts         | 23 +++++++++----------
 .../@angular/compiler/src/runtime_compiler.ts |  6 ++---
 modules/@angular/compiler/src/selector.ts     | 22 ++++++++----------
 .../src/template_parser/template_parser.ts    |  6 ++---
 .../src/view_compiler/compile_element.ts      | 22 +++++++++---------
 .../src/view_compiler/compile_pipe.ts         |  5 ++--
 .../src/view_compiler/compile_query.ts        |  4 ++--
 .../src/view_compiler/compile_view.ts         |  4 ++--
 .../src/view_compiler/event_binder.ts         |  4 ++--
 .../src/view_compiler/property_binder.ts      |  4 ++--
 .../compiler/src/view_compiler/util.ts        |  4 ++--
 .../compiler/test/output/js_emitter_spec.ts   |  4 +---
 .../compiler/test/output/ts_emitter_spec.ts   |  4 +---
 .../differs/default_iterable_differ.ts        |  2 +-
 .../differs/iterable_differs.ts               |  4 ++--
 .../differs/keyvalue_differs.ts               |  4 ++--
 .../@angular/core/src/di/reflective_errors.ts |  4 ++--
 .../@angular/core/src/di/reflective_key.ts    |  4 ++--
 .../core/src/di/reflective_provider.ts        |  4 ++--
 .../core/src/linker/component_factory.ts      |  3 +--
 .../@angular/core/src/linker/view_utils.ts    |  4 ++--
 .../core/test/change_detection/util.ts        | 12 +++++-----
 .../core/test/di/reflective_injector_spec.ts  |  4 ++--
 .../form_group_directive.ts                   |  3 +--
 .../@angular/forms/src/directives/shared.ts   |  6 ++---
 modules/@angular/forms/src/validators.ts      |  4 ++--
 modules/@angular/http/src/headers.ts          |  3 +--
 .../platform-browser/src/dom/dom_adapter.ts   |  4 +---
 .../platform-browser/src/dom/dom_renderer.ts  |  2 +-
 .../src/dom/events/key_events.ts              |  2 +-
 .../test/browser_util_spec.ts                 |  2 +-
 .../platform-server/src/parse5_adapter.ts     |  2 +-
 .../shared/client_message_broker.ts           |  1 -
 .../src/web_workers/worker/renderer.ts        |  8 +++----
 49 files changed, 119 insertions(+), 137 deletions(-)

diff --git a/modules/@angular/benchpress/src/web_driver_extension.ts b/modules/@angular/benchpress/src/web_driver_extension.ts
index 06030e17a45c..83e605c7f749 100644
--- a/modules/@angular/benchpress/src/web_driver_extension.ts
+++ b/modules/@angular/benchpress/src/web_driver_extension.ts
@@ -9,7 +9,6 @@
 import {Injector, OpaqueToken} from '@angular/core';
 
 import {Options} from './common_options';
-import {isBlank} from './facade/lang';
 
 export type PerfLogEvent = {
   [key: string]: any
@@ -50,7 +49,7 @@ export abstract class WebDriverExtension {
               delegate = extension;
             }
           });
-          if (isBlank(delegate)) {
+          if (!delegate) {
             throw new Error('Could not find a delegate for given capabilities!');
           }
           return delegate;
diff --git a/modules/@angular/benchpress/src/webdriver/ios_driver_extension.ts b/modules/@angular/benchpress/src/webdriver/ios_driver_extension.ts
index 0259485bcb0b..00bc1d98084a 100644
--- a/modules/@angular/benchpress/src/webdriver/ios_driver_extension.ts
+++ b/modules/@angular/benchpress/src/webdriver/ios_driver_extension.ts
@@ -52,7 +52,7 @@ export class IOsDriverExtension extends WebDriverExtension {
 
   /** @internal */
   private _convertPerfRecordsToEvents(records: any[], events: PerfLogEvent[] = null) {
-    if (isBlank(events)) {
+    if (!events) {
       events = [];
     }
     records.forEach((record) => {
diff --git a/modules/@angular/benchpress/test/metric/perflog_metric_spec.ts b/modules/@angular/benchpress/test/metric/perflog_metric_spec.ts
index 84f113e3a1ed..eab81efd8b96 100644
--- a/modules/@angular/benchpress/test/metric/perflog_metric_spec.ts
+++ b/modules/@angular/benchpress/test/metric/perflog_metric_spec.ts
@@ -11,7 +11,7 @@ import {AsyncTestCompleter, beforeEach, describe, expect, inject, it} from '@ang
 
 import {Metric, Options, PerfLogEvent, PerfLogFeatures, PerflogMetric, ReflectiveInjector, WebDriverExtension} from '../../index';
 import {StringMapWrapper} from '../../src/facade/collection';
-import {isBlank, isPresent} from '../../src/facade/lang';
+import {isPresent} from '../../src/facade/lang';
 import {TraceEventFactory} from '../trace_event_factory';
 
 export function main() {
@@ -28,11 +28,11 @@ export function main() {
         requestCount?: boolean
       } = {}): Metric {
     commandLog = [];
-    if (isBlank(perfLogFeatures)) {
+    if (!perfLogFeatures) {
       perfLogFeatures =
           new PerfLogFeatures({render: true, gc: true, frameCapture: true, userTiming: true});
     }
-    if (isBlank(microMetrics)) {
+    if (!microMetrics) {
       microMetrics = {};
     }
     var providers: Provider[] = [
diff --git a/modules/@angular/benchpress/test/metric/user_metric_spec.ts b/modules/@angular/benchpress/test/metric/user_metric_spec.ts
index 5680e216d8a9..22ebb452763b 100644
--- a/modules/@angular/benchpress/test/metric/user_metric_spec.ts
+++ b/modules/@angular/benchpress/test/metric/user_metric_spec.ts
@@ -10,7 +10,6 @@ import {Provider, ReflectiveInjector} from '@angular/core';
 import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
 
 import {Options, PerfLogEvent, PerfLogFeatures, UserMetric, WebDriverAdapter} from '../../index';
-import {isBlank} from '../../src/facade/lang';
 
 export function main() {
   var wdAdapter: MockDriverAdapter;
@@ -18,11 +17,11 @@ export function main() {
   function createMetric(
       perfLogs: PerfLogEvent[], perfLogFeatures: PerfLogFeatures,
       {userMetrics}: {userMetrics?: {[key: string]: string}} = {}): UserMetric {
-    if (isBlank(perfLogFeatures)) {
+    if (!perfLogFeatures) {
       perfLogFeatures =
           new PerfLogFeatures({render: true, gc: true, frameCapture: true, userTiming: true});
     }
-    if (isBlank(userMetrics)) {
+    if (!userMetrics) {
       userMetrics = {};
     }
     wdAdapter = new MockDriverAdapter();
diff --git a/modules/@angular/benchpress/test/reporter/console_reporter_spec.ts b/modules/@angular/benchpress/test/reporter/console_reporter_spec.ts
index 5fc5ae3798d6..c3b1a093fa21 100644
--- a/modules/@angular/benchpress/test/reporter/console_reporter_spec.ts
+++ b/modules/@angular/benchpress/test/reporter/console_reporter_spec.ts
@@ -25,7 +25,7 @@ export function main() {
           metrics?: {[key: string]: any}
         }) {
       log = [];
-      if (isBlank(descriptions)) {
+      if (!descriptions) {
         descriptions = [];
       }
       if (isBlank(sampleId)) {
diff --git a/modules/@angular/benchpress/test/runner_spec.ts b/modules/@angular/benchpress/test/runner_spec.ts
index 6121ac6bcd5d..d5399a247e9a 100644
--- a/modules/@angular/benchpress/test/runner_spec.ts
+++ b/modules/@angular/benchpress/test/runner_spec.ts
@@ -9,7 +9,6 @@
 import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
 
 import {Injector, Metric, Options, ReflectiveInjector, Runner, SampleDescription, SampleState, Sampler, Validator, WebDriverAdapter} from '../index';
-import {isBlank} from '../src/facade/lang';
 
 export function main() {
   describe('runner', () => {
@@ -17,7 +16,7 @@ export function main() {
     var runner: Runner;
 
     function createRunner(defaultProviders: any[] = null): Runner {
-      if (isBlank(defaultProviders)) {
+      if (!defaultProviders) {
         defaultProviders = [];
       }
       runner = new Runner([
diff --git a/modules/@angular/benchpress/test/sampler_spec.ts b/modules/@angular/benchpress/test/sampler_spec.ts
index 4d91120e7ce9..345d2865adb9 100644
--- a/modules/@angular/benchpress/test/sampler_spec.ts
+++ b/modules/@angular/benchpress/test/sampler_spec.ts
@@ -26,10 +26,10 @@ export function main() {
       execute?: any
     } = {}) {
       var time = 1000;
-      if (isBlank(metric)) {
+      if (!metric) {
         metric = new MockMetric([]);
       }
-      if (isBlank(reporter)) {
+      if (!reporter) {
         reporter = new MockReporter([]);
       }
       if (isBlank(driver)) {
diff --git a/modules/@angular/benchpress/test/webdriver/chrome_driver_extension_spec.ts b/modules/@angular/benchpress/test/webdriver/chrome_driver_extension_spec.ts
index 3f28baa57c57..f3ab34ecd3cb 100644
--- a/modules/@angular/benchpress/test/webdriver/chrome_driver_extension_spec.ts
+++ b/modules/@angular/benchpress/test/webdriver/chrome_driver_extension_spec.ts
@@ -35,7 +35,7 @@ export function main() {
     function createExtension(
         perfRecords: any[] = null, userAgent: string = null,
         messageMethod = 'Tracing.dataCollected'): WebDriverExtension {
-      if (isBlank(perfRecords)) {
+      if (!perfRecords) {
         perfRecords = [];
       }
       if (isBlank(userAgent)) {
diff --git a/modules/@angular/benchpress/test/webdriver/ios_driver_extension_spec.ts b/modules/@angular/benchpress/test/webdriver/ios_driver_extension_spec.ts
index 242fef407306..5ed46b5fd559 100644
--- a/modules/@angular/benchpress/test/webdriver/ios_driver_extension_spec.ts
+++ b/modules/@angular/benchpress/test/webdriver/ios_driver_extension_spec.ts
@@ -9,7 +9,7 @@
 import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
 
 import {IOsDriverExtension, ReflectiveInjector, WebDriverAdapter, WebDriverExtension} from '../../index';
-import {Json, isBlank} from '../../src/facade/lang';
+import {Json} from '../../src/facade/lang';
 import {TraceEventFactory} from '../trace_event_factory';
 
 export function main() {
@@ -20,7 +20,7 @@ export function main() {
     var normEvents = new TraceEventFactory('timeline', 'pid0');
 
     function createExtension(perfRecords: any[] = null): WebDriverExtension {
-      if (isBlank(perfRecords)) {
+      if (!perfRecords) {
         perfRecords = [];
       }
       log = [];
@@ -156,7 +156,7 @@ function timeEndRecord(name: string, time: number) {
 }
 
 function durationRecord(type: string, startTime: number, endTime: number, children: any[] = null) {
-  if (isBlank(children)) {
+  if (!children) {
     children = [];
   }
   return {'type': type, 'startTime': startTime, 'endTime': endTime, 'children': children};
diff --git a/modules/@angular/common/test/pipes/async_pipe_spec.ts b/modules/@angular/common/test/pipes/async_pipe_spec.ts
index d125c41613d7..4f4f0309f692 100644
--- a/modules/@angular/common/test/pipes/async_pipe_spec.ts
+++ b/modules/@angular/common/test/pipes/async_pipe_spec.ts
@@ -13,7 +13,6 @@ import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
 import {browserDetection} from '@angular/platform-browser/testing/browser_util';
 
 import {EventEmitter} from '../../src/facade/async';
-import {isBlank} from '../../src/facade/lang';
 import {SpyChangeDetectorRef} from '../spies';
 
 export function main() {
@@ -112,7 +111,7 @@ export function main() {
       var promise: Promise<any>;
       var ref: SpyChangeDetectorRef;
       // adds longer timers for passing tests in IE
-      var timer = (!isBlank(getDOM()) && browserDetection.isIE) ? 50 : 10;
+      var timer = (getDOM() && browserDetection.isIE) ? 50 : 10;
 
       beforeEach(() => {
         promise = new Promise((res, rej) => {
diff --git a/modules/@angular/compiler-cli/test/static_reflector_spec.ts b/modules/@angular/compiler-cli/test/static_reflector_spec.ts
index d44e8c212183..75f8c823f8ee 100644
--- a/modules/@angular/compiler-cli/test/static_reflector_spec.ts
+++ b/modules/@angular/compiler-cli/test/static_reflector_spec.ts
@@ -454,7 +454,7 @@ class MockReflectorHost implements StaticReflectorHost {
   getStaticSymbol(declarationFile: string, name: string, members?: string[]): StaticSymbol {
     var cacheKey = `${declarationFile}:${name}${members?'.'+members.join('.'):''}`;
     var result = this.staticTypeCache.get(cacheKey);
-    if (isBlank(result)) {
+    if (!result) {
       result = new StaticSymbol(declarationFile, name, members);
       this.staticTypeCache.set(cacheKey, result);
     }
diff --git a/modules/@angular/compiler/src/animation/animation_compiler.ts b/modules/@angular/compiler/src/animation/animation_compiler.ts
index 3399e8e80081..0622068c1849 100644
--- a/modules/@angular/compiler/src/animation/animation_compiler.ts
+++ b/modules/@angular/compiler/src/animation/animation_compiler.ts
@@ -7,7 +7,7 @@
  */
 
 import {StringMapWrapper} from '../facade/collection';
-import {isBlank, isPresent} from '../facade/lang';
+import {isPresent} from '../facade/lang';
 import {Identifiers, resolveIdentifier} from '../identifiers';
 import * as o from '../output/output_ast';
 import {ANY_STATE, DEFAULT_STATE, EMPTY_STATE} from '../private_import_core';
@@ -323,7 +323,7 @@ class _AnimationBuilderStateMap {
   get states() { return this._states; }
   registerState(name: string, value: {[prop: string]: string | number} = null): void {
     var existingEntry = this._states[name];
-    if (isBlank(existingEntry)) {
+    if (!existingEntry) {
       this._states[name] = value;
     }
   }
diff --git a/modules/@angular/compiler/src/ml_parser/parser.ts b/modules/@angular/compiler/src/ml_parser/parser.ts
index 1dcf48a14a9c..47e7c6272edf 100644
--- a/modules/@angular/compiler/src/ml_parser/parser.ts
+++ b/modules/@angular/compiler/src/ml_parser/parser.ts
@@ -123,7 +123,7 @@ class _TreeBuilder {
     // read =
     while (this._peek.type === lex.TokenType.EXPANSION_CASE_VALUE) {
       let expCase = this._parseExpansionCase();
-      if (isBlank(expCase)) return;  // error
+      if (!expCase) return;  // error
       cases.push(expCase);
     }
 
@@ -154,7 +154,7 @@ class _TreeBuilder {
     const start = this._advance();
 
     const exp = this._collectExpansionExpTokens(start);
-    if (isBlank(exp)) return null;
+    if (!exp) return null;
 
     const end = this._advance();
     exp.push(new lex.Token(lex.TokenType.EOF, [], end.sourceSpan));
diff --git a/modules/@angular/compiler/src/ng_module_compiler.ts b/modules/@angular/compiler/src/ng_module_compiler.ts
index 42e4910d9282..480ee0fadf7f 100644
--- a/modules/@angular/compiler/src/ng_module_compiler.ts
+++ b/modules/@angular/compiler/src/ng_module_compiler.ts
@@ -9,7 +9,7 @@
 import {Injectable} from '@angular/core';
 
 import {CompileDiDependencyMetadata, CompileIdentifierMetadata, CompileNgModuleMetadata, CompileProviderMetadata, CompileTokenMetadata} from './compile_metadata';
-import {isBlank, isPresent} from './facade/lang';
+import {isPresent} from './facade/lang';
 import {Identifiers, resolveIdentifier, resolveIdentifierToken} from './identifiers';
 import * as o from './output/output_ast';
 import {convertValueToOutputAst} from './output/value_util';
@@ -190,7 +190,7 @@ class _InjectorBuilder {
       resolvedProviderValueExpr = providerValueExpressions[0];
       type = providerValueExpressions[0].type;
     }
-    if (isBlank(type)) {
+    if (!type) {
       type = o.DYNAMIC_TYPE;
     }
     if (isEager) {
@@ -223,11 +223,11 @@ class _InjectorBuilder {
                resolveIdentifierToken(Identifiers.ComponentFactoryResolver).reference)) {
         result = o.THIS_EXPR;
       }
-      if (isBlank(result)) {
+      if (!result) {
         result = this._instances.get(dep.token.reference);
       }
     }
-    if (isBlank(result)) {
+    if (!result) {
       var args = [createDiTokenExpression(dep.token)];
       if (dep.isOptional) {
         args.push(o.NULL_EXPR);
diff --git a/modules/@angular/compiler/src/output/output_ast.ts b/modules/@angular/compiler/src/output/output_ast.ts
index f81c5278d752..d64eb1b4c9eb 100644
--- a/modules/@angular/compiler/src/output/output_ast.ts
+++ b/modules/@angular/compiler/src/output/output_ast.ts
@@ -8,7 +8,7 @@
 
 
 import {CompileIdentifierMetadata} from '../compile_metadata';
-import {isBlank, isPresent, isString} from '../facade/lang';
+import {isPresent, isString} from '../facade/lang';
 
 
 
@@ -19,7 +19,7 @@ export enum TypeModifier {
 
 export abstract class Type {
   constructor(public modifiers: TypeModifier[] = null) {
-    if (isBlank(modifiers)) {
+    if (!modifiers) {
       this.modifiers = [];
     }
   }
@@ -462,7 +462,7 @@ export enum StmtModifier {
 
 export abstract class Statement {
   constructor(public modifiers: StmtModifier[] = null) {
-    if (isBlank(modifiers)) {
+    if (!modifiers) {
       this.modifiers = [];
     }
   }
@@ -517,7 +517,7 @@ export class ReturnStatement extends Statement {
 
 export class AbstractClassPart {
   constructor(public type: Type = null, public modifiers: StmtModifier[]) {
-    if (isBlank(modifiers)) {
+    if (!modifiers) {
       this.modifiers = [];
     }
   }
diff --git a/modules/@angular/compiler/src/provider_analyzer.ts b/modules/@angular/compiler/src/provider_analyzer.ts
index 91575e1329d9..f1c2901d997a 100644
--- a/modules/@angular/compiler/src/provider_analyzer.ts
+++ b/modules/@angular/compiler/src/provider_analyzer.ts
@@ -136,10 +136,9 @@ export class ProviderElementContext {
       requestingProviderType: ProviderAstType, token: CompileTokenMetadata,
       eager: boolean): ProviderAst {
     var resolvedProvider = this._allProviders.get(token.reference);
-    if (isBlank(resolvedProvider) ||
-        ((requestingProviderType === ProviderAstType.Directive ||
-          requestingProviderType === ProviderAstType.PublicService) &&
-         resolvedProvider.providerType === ProviderAstType.PrivateService) ||
+    if (!resolvedProvider || ((requestingProviderType === ProviderAstType.Directive ||
+                               requestingProviderType === ProviderAstType.PublicService) &&
+                              resolvedProvider.providerType === ProviderAstType.PrivateService) ||
         ((requestingProviderType === ProviderAstType.PrivateService ||
           requestingProviderType === ProviderAstType.PublicService) &&
          resolvedProvider.providerType === ProviderAstType.Builtin)) {
@@ -239,12 +238,12 @@ export class ProviderElementContext {
       result = this._getLocalDependency(requestingProviderType, dep, eager);
     }
     if (dep.isSelf) {
-      if (isBlank(result) && dep.isOptional) {
+      if (!result && dep.isOptional) {
         result = new CompileDiDependencyMetadata({isValue: true, value: null});
       }
     } else {
       // check parent elements
-      while (isBlank(result) && isPresent(currElement._parent)) {
+      while (!result && isPresent(currElement._parent)) {
         var prevElement = currElement;
         currElement = currElement._parent;
         if (prevElement._isViewRoot) {
@@ -253,7 +252,7 @@ export class ProviderElementContext {
         result = currElement._getLocalDependency(ProviderAstType.PublicService, dep, currEager);
       }
       // check @Host restriction
-      if (isBlank(result)) {
+      if (!result) {
         if (!dep.isHost || this.viewContext.component.type.isHost ||
             this.viewContext.component.type.reference === dep.token.reference ||
             isPresent(this.viewContext.viewProviders.get(dep.token.reference))) {
@@ -265,7 +264,7 @@ export class ProviderElementContext {
         }
       }
     }
-    if (isBlank(result)) {
+    if (!result) {
       this.viewContext.errors.push(
           new ProviderError(`No provider for ${dep.token.name}`, this._sourceSpan));
     }
@@ -311,7 +310,7 @@ export class NgModuleProviderAnalyzer {
 
   private _getOrCreateLocalProvider(token: CompileTokenMetadata, eager: boolean): ProviderAst {
     var resolvedProvider = this._allProviders.get(token.reference);
-    if (isBlank(resolvedProvider)) {
+    if (!resolvedProvider) {
       return null;
     }
     var transformedProviderAst = this._transformedProviders.get(token.reference);
@@ -414,7 +413,7 @@ function _normalizeProviders(
     providers: Array<CompileProviderMetadata|CompileTypeMetadata|any[]>,
     sourceSpan: ParseSourceSpan, targetErrors: ParseError[],
     targetProviders: CompileProviderMetadata[] = null): CompileProviderMetadata[] {
-  if (isBlank(targetProviders)) {
+  if (!targetProviders) {
     targetProviders = [];
   }
   if (isPresent(providers)) {
@@ -479,7 +478,7 @@ function _resolveProviders(
           `Mixing multi and non multi provider is not possible for token ${resolvedProvider.token.name}`,
           sourceSpan));
     }
-    if (isBlank(resolvedProvider)) {
+    if (!resolvedProvider) {
       const lifecycleHooks =
           provider.token.identifier && provider.token.identifier instanceof CompileTypeMetadata ?
           provider.token.identifier.lifecycleHooks :
@@ -530,7 +529,7 @@ function _getContentQueries(directives: CompileDirectiveMetadata[]):
 function _addQueryToTokenMap(map: Map<any, CompileQueryMetadata[]>, query: CompileQueryMetadata) {
   query.selectors.forEach((token: CompileTokenMetadata) => {
     var entry = map.get(token.reference);
-    if (isBlank(entry)) {
+    if (!entry) {
       entry = [];
       map.set(token.reference, entry);
     }
diff --git a/modules/@angular/compiler/src/runtime_compiler.ts b/modules/@angular/compiler/src/runtime_compiler.ts
index 80c96eaf299a..f91af0272e00 100644
--- a/modules/@angular/compiler/src/runtime_compiler.ts
+++ b/modules/@angular/compiler/src/runtime_compiler.ts
@@ -12,7 +12,7 @@ import {AnimationParser} from './animation/animation_parser';
 import {CompileDirectiveMetadata, CompileIdentifierMetadata, CompileNgModuleMetadata, CompilePipeMetadata, ProviderMeta, createHostComponentMeta} from './compile_metadata';
 import {CompilerConfig} from './config';
 import {DirectiveNormalizer} from './directive_normalizer';
-import {isBlank, stringify} from './facade/lang';
+import {stringify} from './facade/lang';
 import {CompileMetadataResolver} from './metadata_resolver';
 import {NgModuleCompiler} from './ng_module_compiler';
 import * as ir from './output/output_ast';
@@ -191,7 +191,7 @@ export class RuntimeCompiler implements Compiler {
 
   private _createCompiledHostTemplate(compType: Type<any>): CompiledTemplate {
     var compiledTemplate = this._compiledHostTemplateCache.get(compType);
-    if (isBlank(compiledTemplate)) {
+    if (!compiledTemplate) {
       var compMeta = this._metadataResolver.getDirectiveMetadata(compType);
       assertComponent(compMeta);
       var hostMeta = createHostComponentMeta(compMeta);
@@ -206,7 +206,7 @@ export class RuntimeCompiler implements Compiler {
   private _createCompiledTemplate(
       compMeta: CompileDirectiveMetadata, ngModule: CompileNgModuleMetadata): CompiledTemplate {
     var compiledTemplate = this._compiledTemplateCache.get(compMeta.type.reference);
-    if (isBlank(compiledTemplate)) {
+    if (!compiledTemplate) {
       assertComponent(compMeta);
       compiledTemplate = new CompiledTemplate(
           false, compMeta.selector, compMeta.type, ngModule.transitiveModule.directives,
diff --git a/modules/@angular/compiler/src/selector.ts b/modules/@angular/compiler/src/selector.ts
index b1408f8e9df0..5c68d49225ea 100644
--- a/modules/@angular/compiler/src/selector.ts
+++ b/modules/@angular/compiler/src/selector.ts
@@ -216,7 +216,7 @@ export class SelectorMatcher {
         if (isTerminal) {
           var terminalMap = matcher._attrValueMap;
           var terminalValuesMap = terminalMap.get(attrName);
-          if (isBlank(terminalValuesMap)) {
+          if (!terminalValuesMap) {
             terminalValuesMap = new Map<string, SelectorContext[]>();
             terminalMap.set(attrName, terminalValuesMap);
           }
@@ -224,7 +224,7 @@ export class SelectorMatcher {
         } else {
           var parttialMap = matcher._attrValuePartialMap;
           var partialValuesMap = parttialMap.get(attrName);
-          if (isBlank(partialValuesMap)) {
+          if (!partialValuesMap) {
             partialValuesMap = new Map<string, SelectorMatcher>();
             parttialMap.set(attrName, partialValuesMap);
           }
@@ -237,7 +237,7 @@ export class SelectorMatcher {
   private _addTerminal(
       map: Map<string, SelectorContext[]>, name: string, selectable: SelectorContext) {
     var terminalList = map.get(name);
-    if (isBlank(terminalList)) {
+    if (!terminalList) {
       terminalList = [];
       map.set(name, terminalList);
     }
@@ -246,7 +246,7 @@ export class SelectorMatcher {
 
   private _addPartial(map: Map<string, SelectorMatcher>, name: string): SelectorMatcher {
     var matcher = map.get(name);
-    if (isBlank(matcher)) {
+    if (!matcher) {
       matcher = new SelectorMatcher();
       map.set(name, matcher);
     }
@@ -316,7 +316,7 @@ export class SelectorMatcher {
   _matchTerminal(
       map: Map<string, SelectorContext[]>, name: string, cssSelector: CssSelector,
       matchedCallback: (c: CssSelector, a: any) => void): boolean {
-    if (isBlank(map) || isBlank(name)) {
+    if (!map || isBlank(name)) {
       return false;
     }
 
@@ -325,7 +325,7 @@ export class SelectorMatcher {
     if (isPresent(starSelectables)) {
       selectables = selectables.concat(starSelectables);
     }
-    if (isBlank(selectables)) {
+    if (!selectables) {
       return false;
     }
     var selectable: SelectorContext;
@@ -341,11 +341,11 @@ export class SelectorMatcher {
   _matchPartial(
       map: Map<string, SelectorMatcher>, name: string, cssSelector: CssSelector,
       matchedCallback: (c: CssSelector, a: any) => void): boolean {
-    if (isBlank(map) || isBlank(name)) {
+    if (!map || isBlank(name)) {
       return false;
     }
     var nestedSelector = map.get(name);
-    if (isBlank(nestedSelector)) {
+    if (!nestedSelector) {
       return false;
     }
     // TODO(perf): get rid of recursion and measure again
@@ -374,13 +374,11 @@ export class SelectorContext {
 
   finalize(cssSelector: CssSelector, callback: (c: CssSelector, a: any) => void): boolean {
     var result = true;
-    if (this.notSelectors.length > 0 &&
-        (isBlank(this.listContext) || !this.listContext.alreadyMatched)) {
+    if (this.notSelectors.length > 0 && (!this.listContext || !this.listContext.alreadyMatched)) {
       var notMatcher = SelectorMatcher.createNotMatcher(this.notSelectors);
       result = !notMatcher.match(cssSelector, null);
     }
-    if (result && isPresent(callback) &&
-        (isBlank(this.listContext) || !this.listContext.alreadyMatched)) {
+    if (result && isPresent(callback) && (!this.listContext || !this.listContext.alreadyMatched)) {
       if (isPresent(this.listContext)) {
         this.listContext.alreadyMatched = true;
       }
diff --git a/modules/@angular/compiler/src/template_parser/template_parser.ts b/modules/@angular/compiler/src/template_parser/template_parser.ts
index 1f3c58fee3fd..5710605bd651 100644
--- a/modules/@angular/compiler/src/template_parser/template_parser.ts
+++ b/modules/@angular/compiler/src/template_parser/template_parser.ts
@@ -12,7 +12,7 @@ import {CompileDirectiveMetadata, CompilePipeMetadata, CompileTemplateMetadata,
 import {AST, ASTWithSource, BindingPipe, EmptyExpr, Interpolation, ParserError, RecursiveAstVisitor, TemplateBinding} from '../expression_parser/ast';
 import {Parser} from '../expression_parser/parser';
 import {StringMapWrapper} from '../facade/collection';
-import {isBlank, isPresent, isString} from '../facade/lang';
+import {isPresent, isString} from '../facade/lang';
 import {I18NHtmlParser} from '../i18n/i18n_html_parser';
 import {Identifiers, identifierToken, resolveIdentifierToken} from '../identifiers';
 import * as html from '../ml_parser/ast';
@@ -869,7 +869,7 @@ class TemplateParseVisitor implements html.Visitor {
       const boundPropsByName = new Map<string, BoundElementOrDirectiveProperty>();
       boundProps.forEach(boundProp => {
         const prevValue = boundPropsByName.get(boundProp.name);
-        if (isBlank(prevValue) || prevValue.isLiteral) {
+        if (!prevValue || prevValue.isLiteral) {
           // give [a]="b" a higher precedence than a="b" on the same element
           boundPropsByName.set(boundProp.name, boundProp);
         }
@@ -900,7 +900,7 @@ class TemplateParseVisitor implements html.Visitor {
     });
 
     props.forEach((prop: BoundElementOrDirectiveProperty) => {
-      if (!prop.isLiteral && isBlank(boundDirectivePropsIndex.get(prop.name))) {
+      if (!prop.isLiteral && !boundDirectivePropsIndex.get(prop.name)) {
         boundElementProps.push(this._createElementPropertyAst(
             elementName, prop.name, prop.expression, prop.sourceSpan));
       }
diff --git a/modules/@angular/compiler/src/view_compiler/compile_element.ts b/modules/@angular/compiler/src/view_compiler/compile_element.ts
index 01ee5d8cffe5..575929a78902 100644
--- a/modules/@angular/compiler/src/view_compiler/compile_element.ts
+++ b/modules/@angular/compiler/src/view_compiler/compile_element.ts
@@ -9,7 +9,7 @@
 
 import {CompileDiDependencyMetadata, CompileDirectiveMetadata, CompileIdentifierMetadata, CompileProviderMetadata, CompileQueryMetadata, CompileTokenMetadata} from '../compile_metadata';
 import {ListWrapper, MapWrapper, StringMapWrapper} from '../facade/collection';
-import {isBlank, isPresent} from '../facade/lang';
+import {isPresent} from '../facade/lang';
 import {Identifiers, identifierToken, resolveIdentifier, resolveIdentifierToken} from '../identifiers';
 import * as o from '../output/output_ast';
 import {convertValueToOutputAst} from '../output/value_util';
@@ -27,7 +27,7 @@ export class CompileNode {
       public parent: CompileElement, public view: CompileView, public nodeIndex: number,
       public renderNode: o.Expression, public sourceAst: TemplateAst) {}
 
-  isNull(): boolean { return isBlank(this.renderNode); }
+  isNull(): boolean { return !this.renderNode; }
 
   isRootElement(): boolean { return this.view != this.parent.view; }
 }
@@ -313,12 +313,12 @@ export class CompileElement extends CompileNode {
       requestingProviderType: ProviderAstType, dep: CompileDiDependencyMetadata): o.Expression {
     var result: o.Expression = null;
     // constructor content query
-    if (isBlank(result) && isPresent(dep.query)) {
+    if (!result && isPresent(dep.query)) {
       result = this._addQuery(dep.query, null).queryList;
     }
 
     // constructor view query
-    if (isBlank(result) && isPresent(dep.viewQuery)) {
+    if (!result && isPresent(dep.viewQuery)) {
       result = createQueryList(
           dep.viewQuery, null,
           `_viewQuery_${dep.viewQuery.selectors[0].name}_${this.nodeIndex}_${this._componentConstructorViewQueryLists.length}`,
@@ -328,7 +328,7 @@ export class CompileElement extends CompileNode {
 
     if (isPresent(dep.token)) {
       // access builtins with special visibility
-      if (isBlank(result)) {
+      if (!result) {
         if (dep.token.reference ===
             resolveIdentifierToken(Identifiers.ChangeDetectorRef).reference) {
           if (requestingProviderType === ProviderAstType.Component) {
@@ -339,7 +339,7 @@ export class CompileElement extends CompileNode {
         }
       }
       // access regular providers on the element
-      if (isBlank(result)) {
+      if (!result) {
         let resolvedProvider = this._resolvedProviders.get(dep.token.reference);
         // don't allow directives / public services to access private services.
         // only components and private services can access private services.
@@ -361,20 +361,20 @@ export class CompileElement extends CompileNode {
     if (dep.isValue) {
       result = o.literal(dep.value);
     }
-    if (isBlank(result) && !dep.isSkipSelf) {
+    if (!result && !dep.isSkipSelf) {
       result = this._getLocalDependency(requestingProviderType, dep);
     }
     // check parent elements
-    while (isBlank(result) && !currElement.parent.isNull()) {
+    while (!result && !currElement.parent.isNull()) {
       currElement = currElement.parent;
       result = currElement._getLocalDependency(
           ProviderAstType.PublicService, new CompileDiDependencyMetadata({token: dep.token}));
     }
 
-    if (isBlank(result)) {
+    if (!result) {
       result = injectFromViewParentInjector(dep.token, dep.isOptional);
     }
-    if (isBlank(result)) {
+    if (!result) {
       result = o.NULL_EXPR;
     }
     return getPropertyInView(result, this.view, currElement.view);
@@ -411,7 +411,7 @@ function createProviderProperty(
     resolvedProviderValueExpr = providerValueExpressions[0];
     type = providerValueExpressions[0].type;
   }
-  if (isBlank(type)) {
+  if (!type) {
     type = o.DYNAMIC_TYPE;
   }
   if (isEager) {
diff --git a/modules/@angular/compiler/src/view_compiler/compile_pipe.ts b/modules/@angular/compiler/src/view_compiler/compile_pipe.ts
index ec02559bb77d..ff5a02983f95 100644
--- a/modules/@angular/compiler/src/view_compiler/compile_pipe.ts
+++ b/modules/@angular/compiler/src/view_compiler/compile_pipe.ts
@@ -8,7 +8,6 @@
 
 
 import {CompilePipeMetadata} from '../compile_metadata';
-import {isBlank} from '../facade/lang';
 import {Identifiers, resolveIdentifier, resolveIdentifierToken} from '../identifiers';
 import * as o from '../output/output_ast';
 
@@ -23,7 +22,7 @@ export class CompilePipe {
     if (meta.pure) {
       // pure pipes live on the component view
       pipe = compView.purePipes.get(name);
-      if (isBlank(pipe)) {
+      if (!pipe) {
         pipe = new CompilePipe(compView, meta);
         compView.purePipes.set(name, pipe);
         compView.pipes.push(pipe);
@@ -85,7 +84,7 @@ function _findPipeMeta(view: CompileView, name: string): CompilePipeMetadata {
       break;
     }
   }
-  if (isBlank(pipeMeta)) {
+  if (!pipeMeta) {
     throw new Error(
         `Illegal state: Could not find pipe ${name} although the parser should have detected this error!`);
   }
diff --git a/modules/@angular/compiler/src/view_compiler/compile_query.ts b/modules/@angular/compiler/src/view_compiler/compile_query.ts
index 0fba9175b384..1bd02aa237c4 100644
--- a/modules/@angular/compiler/src/view_compiler/compile_query.ts
+++ b/modules/@angular/compiler/src/view_compiler/compile_query.ts
@@ -8,7 +8,7 @@
 
 import {CompileQueryMetadata} from '../compile_metadata';
 import {ListWrapper} from '../facade/collection';
-import {isBlank, isPresent} from '../facade/lang';
+import {isPresent} from '../facade/lang';
 import {Identifiers, resolveIdentifier} from '../identifiers';
 import * as o from '../output/output_ast';
 
@@ -129,7 +129,7 @@ export function createQueryList(
 export function addQueryToTokenMap(map: Map<any, CompileQuery[]>, query: CompileQuery) {
   query.meta.selectors.forEach((selector) => {
     var entry = map.get(selector.reference);
-    if (isBlank(entry)) {
+    if (!entry) {
       entry = [];
       map.set(selector.reference, entry);
     }
diff --git a/modules/@angular/compiler/src/view_compiler/compile_view.ts b/modules/@angular/compiler/src/view_compiler/compile_view.ts
index 5b5b4b1bf258..eab5c45bf331 100644
--- a/modules/@angular/compiler/src/view_compiler/compile_view.ts
+++ b/modules/@angular/compiler/src/view_compiler/compile_view.ts
@@ -10,7 +10,7 @@ import {AnimationEntryCompileResult} from '../animation/animation_compiler';
 import {CompileDirectiveMetadata, CompileIdentifierMetadata, CompilePipeMetadata} from '../compile_metadata';
 import {CompilerConfig} from '../config';
 import {ListWrapper, MapWrapper} from '../facade/collection';
-import {isBlank, isPresent} from '../facade/lang';
+import {isPresent} from '../facade/lang';
 import {Identifiers, resolveIdentifier} from '../identifiers';
 import * as o from '../output/output_ast';
 import {ViewType} from '../private_import_core';
@@ -138,7 +138,7 @@ export class CompileView implements NameResolver {
     }
     var currView: CompileView = this;
     var result = currView.locals.get(name);
-    while (isBlank(result) && isPresent(currView.declarationElement.view)) {
+    while (!result && isPresent(currView.declarationElement.view)) {
       currView = currView.declarationElement.view;
       result = currView.locals.get(name);
     }
diff --git a/modules/@angular/compiler/src/view_compiler/event_binder.ts b/modules/@angular/compiler/src/view_compiler/event_binder.ts
index b491c4daa8bf..9673640f906c 100644
--- a/modules/@angular/compiler/src/view_compiler/event_binder.ts
+++ b/modules/@angular/compiler/src/view_compiler/event_binder.ts
@@ -8,7 +8,7 @@
 
 import {CompileDirectiveMetadata} from '../compile_metadata';
 import {StringMapWrapper} from '../facade/collection';
-import {StringWrapper, isBlank, isPresent} from '../facade/lang';
+import {StringWrapper, isPresent} from '../facade/lang';
 import {identifierToken} from '../identifiers';
 import * as o from '../output/output_ast';
 import {BoundEventAst, DirectiveAst} from '../template_parser/template_ast';
@@ -32,7 +32,7 @@ export class CompileEventListener {
     var listener = targetEventListeners.find(
         listener => listener.eventTarget == eventTarget && listener.eventName == eventName &&
             listener.eventPhase == eventPhase);
-    if (isBlank(listener)) {
+    if (!listener) {
       listener = new CompileEventListener(
           compileElement, eventTarget, eventName, eventPhase, targetEventListeners.length);
       targetEventListeners.push(listener);
diff --git a/modules/@angular/compiler/src/view_compiler/property_binder.ts b/modules/@angular/compiler/src/view_compiler/property_binder.ts
index 19e5caaaa71a..192ec98db2d2 100644
--- a/modules/@angular/compiler/src/view_compiler/property_binder.ts
+++ b/modules/@angular/compiler/src/view_compiler/property_binder.ts
@@ -9,7 +9,7 @@
 import {SecurityContext} from '@angular/core';
 
 import * as cdAst from '../expression_parser/ast';
-import {isBlank, isPresent} from '../facade/lang';
+import {isPresent} from '../facade/lang';
 import {Identifiers, resolveIdentifier} from '../identifiers';
 import * as o from '../output/output_ast';
 import {EMPTY_STATE as EMPTY_ANIMATION_STATE, LifecycleHooks, isDefaultChangeDetectionStrategy} from '../private_import_core';
@@ -37,7 +37,7 @@ function bind(
     method: CompileMethod, bindingIndex: number) {
   var checkExpression = convertCdExpressionToIr(
       view, context, parsedExpression, DetectChangesVars.valUnwrapper, bindingIndex);
-  if (isBlank(checkExpression.expression)) {
+  if (!checkExpression.expression) {
     // e.g. an empty expression was given
     return;
   }
diff --git a/modules/@angular/compiler/src/view_compiler/util.ts b/modules/@angular/compiler/src/view_compiler/util.ts
index cb422b6e949a..59b66bf26d46 100644
--- a/modules/@angular/compiler/src/view_compiler/util.ts
+++ b/modules/@angular/compiler/src/view_compiler/util.ts
@@ -8,7 +8,7 @@
 
 
 import {CompileDirectiveMetadata, CompileTokenMetadata} from '../compile_metadata';
-import {isBlank, isPresent} from '../facade/lang';
+import {isPresent} from '../facade/lang';
 import {Identifiers, resolveIdentifier} from '../identifiers';
 import * as o from '../output/output_ast';
 import {createDiTokenExpression} from '../util';
@@ -84,7 +84,7 @@ export function createPureProxy(
   view.fields.push(new o.ClassField(pureProxyProp.name, null));
   var pureProxyId =
       argCount < Identifiers.pureProxies.length ? Identifiers.pureProxies[argCount] : null;
-  if (isBlank(pureProxyId)) {
+  if (!pureProxyId) {
     throw new Error(`Unsupported number of argument for pure functions: ${argCount}`);
   }
   view.createMethod.addStmt(o.THIS_EXPR.prop(pureProxyProp.name)
diff --git a/modules/@angular/compiler/test/output/js_emitter_spec.ts b/modules/@angular/compiler/test/output/js_emitter_spec.ts
index f293320358b5..387292a2fbef 100644
--- a/modules/@angular/compiler/test/output/js_emitter_spec.ts
+++ b/modules/@angular/compiler/test/output/js_emitter_spec.ts
@@ -11,8 +11,6 @@ import {JavaScriptEmitter} from '@angular/compiler/src/output/js_emitter';
 import * as o from '@angular/compiler/src/output/output_ast';
 import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal';
 
-import {isBlank} from '../../src/facade/lang';
-
 import {SimpleJsImportGenerator} from './output_emitter_util';
 
 var someModuleUrl = 'asset:somePackage/lib/somePath';
@@ -39,7 +37,7 @@ export function main() {
     });
 
     function emitStmt(stmt: o.Statement, exportedVars: string[] = null): string {
-      if (isBlank(exportedVars)) {
+      if (!exportedVars) {
         exportedVars = [];
       }
       return emitter.emitStatements(someModuleUrl, [stmt], exportedVars);
diff --git a/modules/@angular/compiler/test/output/ts_emitter_spec.ts b/modules/@angular/compiler/test/output/ts_emitter_spec.ts
index ff3d782af817..e60c3205bb0a 100644
--- a/modules/@angular/compiler/test/output/ts_emitter_spec.ts
+++ b/modules/@angular/compiler/test/output/ts_emitter_spec.ts
@@ -11,8 +11,6 @@ import * as o from '@angular/compiler/src/output/output_ast';
 import {TypeScriptEmitter} from '@angular/compiler/src/output/ts_emitter';
 import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal';
 
-import {isBlank} from '../../src/facade/lang';
-
 import {SimpleJsImportGenerator} from './output_emitter_util';
 
 var someModuleUrl = 'asset:somePackage/lib/somePath';
@@ -39,7 +37,7 @@ export function main() {
     });
 
     function emitStmt(stmt: o.Statement, exportedVars: string[] = null): string {
-      if (isBlank(exportedVars)) {
+      if (!exportedVars) {
         exportedVars = [];
       }
       return emitter.emitStatements(someModuleUrl, [stmt], exportedVars);
diff --git a/modules/@angular/core/src/change_detection/differs/default_iterable_differ.ts b/modules/@angular/core/src/change_detection/differs/default_iterable_differ.ts
index 464358ff8b27..23b5a4694314 100644
--- a/modules/@angular/core/src/change_detection/differs/default_iterable_differ.ts
+++ b/modules/@angular/core/src/change_detection/differs/default_iterable_differ.ts
@@ -722,7 +722,7 @@ class _DuplicateMap {
     var key = getMapKey(trackById);
 
     var recordList = this.map.get(key);
-    return isBlank(recordList) ? null : recordList.get(trackById, afterIndex);
+    return recordList ? recordList.get(trackById, afterIndex) : null;
   }
 
   /**
diff --git a/modules/@angular/core/src/change_detection/differs/iterable_differs.ts b/modules/@angular/core/src/change_detection/differs/iterable_differs.ts
index e2d432ec39af..3ac21973e8ef 100644
--- a/modules/@angular/core/src/change_detection/differs/iterable_differs.ts
+++ b/modules/@angular/core/src/change_detection/differs/iterable_differs.ts
@@ -8,7 +8,7 @@
 
 import {Optional, Provider, SkipSelf} from '../../di';
 import {ListWrapper} from '../../facade/collection';
-import {getTypeNameForDebugging, isBlank, isPresent} from '../../facade/lang';
+import {getTypeNameForDebugging, isPresent} from '../../facade/lang';
 import {ChangeDetectorRef} from '../change_detector_ref';
 
 
@@ -82,7 +82,7 @@ export class IterableDiffers {
     return {
       provide: IterableDiffers,
       useFactory: (parent: IterableDiffers) => {
-        if (isBlank(parent)) {
+        if (!parent) {
           // Typically would occur when calling IterableDiffers.extend inside of dependencies passed
           // to
           // bootstrap(), which would override default pipes instead of extending them.
diff --git a/modules/@angular/core/src/change_detection/differs/keyvalue_differs.ts b/modules/@angular/core/src/change_detection/differs/keyvalue_differs.ts
index bfe7e415d20c..518875535840 100644
--- a/modules/@angular/core/src/change_detection/differs/keyvalue_differs.ts
+++ b/modules/@angular/core/src/change_detection/differs/keyvalue_differs.ts
@@ -8,7 +8,7 @@
 
 import {Optional, Provider, SkipSelf} from '../../di';
 import {ListWrapper} from '../../facade/collection';
-import {isBlank, isPresent} from '../../facade/lang';
+import {isPresent} from '../../facade/lang';
 import {ChangeDetectorRef} from '../change_detector_ref';
 
 
@@ -72,7 +72,7 @@ export class KeyValueDiffers {
     return {
       provide: KeyValueDiffers,
       useFactory: (parent: KeyValueDiffers) => {
-        if (isBlank(parent)) {
+        if (!parent) {
           // Typically would occur when calling KeyValueDiffers.extend inside of dependencies passed
           // to
           // bootstrap(), which would override default pipes instead of extending them.
diff --git a/modules/@angular/core/src/di/reflective_errors.ts b/modules/@angular/core/src/di/reflective_errors.ts
index 12da8a9db87e..58d9bb6419b2 100644
--- a/modules/@angular/core/src/di/reflective_errors.ts
+++ b/modules/@angular/core/src/di/reflective_errors.ts
@@ -8,7 +8,7 @@
 
 import {ListWrapper} from '../facade/collection';
 import {BaseError, WrappedError} from '../facade/errors';
-import {isBlank, stringify} from '../facade/lang';
+import {stringify} from '../facade/lang';
 import {Type} from '../type';
 
 import {ReflectiveInjector} from './reflective_injector';
@@ -229,7 +229,7 @@ export class NoAnnotationError extends BaseError {
     var signature: string[] = [];
     for (var i = 0, ii = params.length; i < ii; i++) {
       var parameter = params[i];
-      if (isBlank(parameter) || parameter.length == 0) {
+      if (!parameter || parameter.length == 0) {
         signature.push('?');
       } else {
         signature.push(parameter.map(stringify).join(' '));
diff --git a/modules/@angular/core/src/di/reflective_key.ts b/modules/@angular/core/src/di/reflective_key.ts
index 86b7ad4809af..f2d4f090b1e9 100644
--- a/modules/@angular/core/src/di/reflective_key.ts
+++ b/modules/@angular/core/src/di/reflective_key.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {isBlank, stringify} from '../facade/lang';
+import {stringify} from '../facade/lang';
 
 import {resolveForwardRef} from './forward_ref';
 
@@ -32,7 +32,7 @@ export class ReflectiveKey {
    * Private
    */
   constructor(public token: Object, public id: number) {
-    if (isBlank(token)) {
+    if (!token) {
       throw new Error('Token must be defined!');
     }
   }
diff --git a/modules/@angular/core/src/di/reflective_provider.ts b/modules/@angular/core/src/di/reflective_provider.ts
index 63435e0fd4f0..e7bd400aea59 100644
--- a/modules/@angular/core/src/di/reflective_provider.ts
+++ b/modules/@angular/core/src/di/reflective_provider.ts
@@ -201,7 +201,7 @@ function _normalizeProviders(providers: Provider[], res: Provider[]): Provider[]
 
 export function constructDependencies(
     typeOrFunc: any, dependencies: any[]): ReflectiveDependency[] {
-  if (isBlank(dependencies)) {
+  if (!dependencies) {
     return _dependenciesFor(typeOrFunc);
   } else {
     var params: any[][] = dependencies.map(t => [t]);
@@ -211,7 +211,7 @@ export function constructDependencies(
 
 function _dependenciesFor(typeOrFunc: any): ReflectiveDependency[] {
   var params = reflector.parameters(typeOrFunc);
-  if (isBlank(params)) return [];
+  if (!params) return [];
   if (params.some(isBlank)) {
     throw new NoAnnotationError(typeOrFunc, params);
   }
diff --git a/modules/@angular/core/src/linker/component_factory.ts b/modules/@angular/core/src/linker/component_factory.ts
index 792ce1ee20f3..9764252e3060 100644
--- a/modules/@angular/core/src/linker/component_factory.ts
+++ b/modules/@angular/core/src/linker/component_factory.ts
@@ -9,7 +9,6 @@
 import {ChangeDetectorRef} from '../change_detection/change_detection';
 import {Injector} from '../di/injector';
 import {unimplemented} from '../facade/errors';
-import {isBlank} from '../facade/lang';
 import {Type} from '../type';
 import {AppElement} from './element';
 import {ElementRef} from './element_ref';
@@ -101,7 +100,7 @@ export class ComponentFactory<C> {
       injector: Injector, projectableNodes: any[][] = null,
       rootSelectorOrNode: string|any = null): ComponentRef<C> {
     var vu: ViewUtils = injector.get(ViewUtils);
-    if (isBlank(projectableNodes)) {
+    if (!projectableNodes) {
       projectableNodes = [];
     }
     // Note: Host views don't need a declarationAppElement!
diff --git a/modules/@angular/core/src/linker/view_utils.ts b/modules/@angular/core/src/linker/view_utils.ts
index c10b575a5ad4..8780f250e9f5 100644
--- a/modules/@angular/core/src/linker/view_utils.ts
+++ b/modules/@angular/core/src/linker/view_utils.ts
@@ -10,7 +10,7 @@ import {APP_ID} from '../application_tokens';
 import {devModeEqual} from '../change_detection/change_detection';
 import {UNINITIALIZED} from '../change_detection/change_detection_util';
 import {Inject, Injectable} from '../di';
-import {isBlank, isPresent, looseIdentical} from '../facade/lang';
+import {isPresent, looseIdentical} from '../facade/lang';
 import {ViewEncapsulation} from '../metadata/view';
 import {RenderComponentType, Renderer, RootRenderer} from '../render/api';
 import {Sanitizer} from '../security';
@@ -72,7 +72,7 @@ const EMPTY_ARR: any[] = [];
 
 export function ensureSlotCount(projectableNodes: any[][], expectedSlotCount: number): any[][] {
   var res: any[][];
-  if (isBlank(projectableNodes)) {
+  if (!projectableNodes) {
     res = EMPTY_ARR;
   } else if (projectableNodes.length < expectedSlotCount) {
     var givenSlotCount = projectableNodes.length;
diff --git a/modules/@angular/core/test/change_detection/util.ts b/modules/@angular/core/test/change_detection/util.ts
index c190a397ae32..5e43c23a9454 100644
--- a/modules/@angular/core/test/change_detection/util.ts
+++ b/modules/@angular/core/test/change_detection/util.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {isBlank} from '../../src/facade/lang';
+
 
 export function iterableChangesAsString(
     {collection = [] as any, previous = [] as any, additions = [] as any, moves = [] as any,
@@ -23,11 +23,11 @@ export function kvChangesAsString(
     {map, previous, additions, changes, removals}:
         {map?: any[], previous?: any[], additions?: any[], changes?: any[], removals?: any[]}):
     string {
-  if (isBlank(map)) map = [];
-  if (isBlank(previous)) previous = [];
-  if (isBlank(additions)) additions = [];
-  if (isBlank(changes)) changes = [];
-  if (isBlank(removals)) removals = [];
+  if (!map) map = [];
+  if (!previous) previous = [];
+  if (!additions) additions = [];
+  if (!changes) changes = [];
+  if (!removals) removals = [];
 
   return 'map: ' + map.join(', ') + '\n' +
       'previous: ' + previous.join(', ') + '\n' +
diff --git a/modules/@angular/core/test/di/reflective_injector_spec.ts b/modules/@angular/core/test/di/reflective_injector_spec.ts
index ca4d4ab9e400..922572092375 100644
--- a/modules/@angular/core/test/di/reflective_injector_spec.ts
+++ b/modules/@angular/core/test/di/reflective_injector_spec.ts
@@ -11,7 +11,7 @@ import {ReflectiveInjectorDynamicStrategy, ReflectiveInjectorInlineStrategy, Ref
 import {ResolvedReflectiveProvider_} from '@angular/core/src/di/reflective_provider';
 import {expect} from '@angular/platform-browser/testing/matchers';
 
-import {isBlank, isPresent, stringify} from '../../src/facade/lang';
+import {isPresent, stringify} from '../../src/facade/lang';
 
 class Engine {}
 
@@ -458,7 +458,7 @@ export function main() {
       it('should resolve and flatten', () => {
         var providers = ReflectiveInjector.resolve([Engine, [BrokenEngine]]);
         providers.forEach(function(b) {
-          if (isBlank(b)) return;  // the result is a sparse array
+          if (!b) return;  // the result is a sparse array
           expect(b instanceof ResolvedReflectiveProvider_).toBe(true);
         });
       });
diff --git a/modules/@angular/forms/src/directives/reactive_directives/form_group_directive.ts b/modules/@angular/forms/src/directives/reactive_directives/form_group_directive.ts
index ab41b561fbe8..d908ababc8cb 100644
--- a/modules/@angular/forms/src/directives/reactive_directives/form_group_directive.ts
+++ b/modules/@angular/forms/src/directives/reactive_directives/form_group_directive.ts
@@ -10,7 +10,6 @@ import {Directive, Inject, Input, OnChanges, Optional, Output, Self, SimpleChang
 
 import {EventEmitter} from '../../facade/async';
 import {ListWrapper} from '../../facade/collection';
-import {isBlank} from '../../facade/lang';
 import {FormArray, FormControl, FormGroup} from '../../model';
 import {NG_ASYNC_VALIDATORS, NG_VALIDATORS, Validators} from '../../validators';
 import {ControlContainer} from '../control_container';
@@ -174,7 +173,7 @@ export class FormGroupDirective extends ControlContainer implements Form,
   }
 
   private _checkFormPresent() {
-    if (isBlank(this.form)) {
+    if (!this.form) {
       ReactiveErrors.missingFormException();
     }
   }
diff --git a/modules/@angular/forms/src/directives/shared.ts b/modules/@angular/forms/src/directives/shared.ts
index b2b87668348e..49412ee44d5d 100644
--- a/modules/@angular/forms/src/directives/shared.ts
+++ b/modules/@angular/forms/src/directives/shared.ts
@@ -35,8 +35,8 @@ export function controlPath(name: string, parent: ControlContainer): string[] {
 }
 
 export function setUpControl(control: FormControl, dir: NgControl): void {
-  if (isBlank(control)) _throwError(dir, 'Cannot find control with');
-  if (isBlank(dir.valueAccessor)) _throwError(dir, 'No value accessor for form control with');
+  if (!control) _throwError(dir, 'Cannot find control with');
+  if (!dir.valueAccessor) _throwError(dir, 'No value accessor for form control with');
 
   control.validator = Validators.compose([control.validator, dir.validator]);
   control.asyncValidator = Validators.composeAsync([control.asyncValidator, dir.asyncValidator]);
@@ -139,7 +139,7 @@ export function isBuiltInAccessor(valueAccessor: ControlValueAccessor): boolean
 // TODO: vsavkin remove it once https://github.com/angular/angular/issues/3011 is implemented
 export function selectValueAccessor(
     dir: NgControl, valueAccessors: ControlValueAccessor[]): ControlValueAccessor {
-  if (isBlank(valueAccessors)) return null;
+  if (!valueAccessors) return null;
 
   var defaultAccessor: ControlValueAccessor;
   var builtinAccessor: ControlValueAccessor;
diff --git a/modules/@angular/forms/src/validators.ts b/modules/@angular/forms/src/validators.ts
index 196a9d4f7fbf..805bebdbea22 100644
--- a/modules/@angular/forms/src/validators.ts
+++ b/modules/@angular/forms/src/validators.ts
@@ -114,7 +114,7 @@ export class Validators {
    * of the individual error maps.
    */
   static compose(validators: ValidatorFn[]): ValidatorFn {
-    if (isBlank(validators)) return null;
+    if (!validators) return null;
     var presentValidators = validators.filter(isPresent);
     if (presentValidators.length == 0) return null;
 
@@ -124,7 +124,7 @@ export class Validators {
   }
 
   static composeAsync(validators: AsyncValidatorFn[]): AsyncValidatorFn {
-    if (isBlank(validators)) return null;
+    if (!validators) return null;
     var presentValidators = validators.filter(isPresent);
     if (presentValidators.length == 0) return null;
 
diff --git a/modules/@angular/http/src/headers.ts b/modules/@angular/http/src/headers.ts
index b3c206038a0c..9eb16ac31a51 100644
--- a/modules/@angular/http/src/headers.ts
+++ b/modules/@angular/http/src/headers.ts
@@ -7,7 +7,6 @@
  */
 
 import {ListWrapper, MapWrapper, StringMapWrapper, isListLikeIterable, iterateListLike} from '../src/facade/collection';
-import {isBlank} from '../src/facade/lang';
 
 /**
  * Polyfill for [Headers](https://developer.mozilla.org/en-US/docs/Web/API/Headers/Headers), as
@@ -48,7 +47,7 @@ export class Headers {
 
     this._headersMap = new Map<string, string[]>();
 
-    if (isBlank(headers)) {
+    if (!headers) {
       return;
     }
 
diff --git a/modules/@angular/platform-browser/src/dom/dom_adapter.ts b/modules/@angular/platform-browser/src/dom/dom_adapter.ts
index 6d9824420ab1..ac16c914a5d0 100644
--- a/modules/@angular/platform-browser/src/dom/dom_adapter.ts
+++ b/modules/@angular/platform-browser/src/dom/dom_adapter.ts
@@ -8,8 +8,6 @@
 
 import {Type} from '@angular/core';
 
-import {isBlank} from '../facade/lang';
-
 var _DOM: DomAdapter = null;
 
 export function getDOM() {
@@ -21,7 +19,7 @@ export function setDOM(adapter: DomAdapter) {
 }
 
 export function setRootDomAdapter(adapter: DomAdapter) {
-  if (isBlank(_DOM)) {
+  if (!_DOM) {
     _DOM = adapter;
   }
 }
diff --git a/modules/@angular/platform-browser/src/dom/dom_renderer.ts b/modules/@angular/platform-browser/src/dom/dom_renderer.ts
index fed8d631ccd0..bd5c68d0db80 100644
--- a/modules/@angular/platform-browser/src/dom/dom_renderer.ts
+++ b/modules/@angular/platform-browser/src/dom/dom_renderer.ts
@@ -34,7 +34,7 @@ export abstract class DomRootRenderer implements RootRenderer {
 
   renderComponent(componentProto: RenderComponentType): Renderer {
     var renderer = this.registeredComponents.get(componentProto.id);
-    if (isBlank(renderer)) {
+    if (!renderer) {
       renderer = new DomRenderer(this, componentProto, this.animationDriver);
       this.registeredComponents.set(componentProto.id, renderer);
     }
diff --git a/modules/@angular/platform-browser/src/dom/events/key_events.ts b/modules/@angular/platform-browser/src/dom/events/key_events.ts
index 54cff44bcf83..cf7257878321 100644
--- a/modules/@angular/platform-browser/src/dom/events/key_events.ts
+++ b/modules/@angular/platform-browser/src/dom/events/key_events.ts
@@ -8,7 +8,7 @@
 
 import {Injectable, NgZone} from '@angular/core';
 
-import {ListWrapper, StringMapWrapper} from '../../facade/collection';
+import {ListWrapper} from '../../facade/collection';
 import {StringWrapper, isPresent} from '../../facade/lang';
 import {getDOM} from '../dom_adapter';
 
diff --git a/modules/@angular/platform-browser/test/browser_util_spec.ts b/modules/@angular/platform-browser/test/browser_util_spec.ts
index e8e217921fc8..39ef214084d1 100644
--- a/modules/@angular/platform-browser/test/browser_util_spec.ts
+++ b/modules/@angular/platform-browser/test/browser_util_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {StringMapWrapper} from '../src/facade/collection';
+
 import {BrowserDetection} from '../testing/browser_util';
 
 export function main() {
diff --git a/modules/@angular/platform-server/src/parse5_adapter.ts b/modules/@angular/platform-server/src/parse5_adapter.ts
index c3cad1fec867..35c4969e3949 100644
--- a/modules/@angular/platform-server/src/parse5_adapter.ts
+++ b/modules/@angular/platform-server/src/parse5_adapter.ts
@@ -135,7 +135,7 @@ export class Parse5DomAdapter extends DomAdapter {
   }
   on(el: any /** TODO #9100 */, evt: any /** TODO #9100 */, listener: any /** TODO #9100 */) {
     var listenersMap: {[k: string]: any} = el._eventListenersMap;
-    if (isBlank(listenersMap)) {
+    if (!listenersMap) {
       var listenersMap: {[k: string]: any} = {};
       el._eventListenersMap = listenersMap;
     }
diff --git a/modules/@angular/platform-webworker/src/web_workers/shared/client_message_broker.ts b/modules/@angular/platform-webworker/src/web_workers/shared/client_message_broker.ts
index 6eaad1cfa39f..f450417d6f98 100644
--- a/modules/@angular/platform-webworker/src/web_workers/shared/client_message_broker.ts
+++ b/modules/@angular/platform-webworker/src/web_workers/shared/client_message_broker.ts
@@ -9,7 +9,6 @@
 import {Injectable, Type} from '@angular/core';
 
 import {EventEmitter} from '../../facade/async';
-import {StringMapWrapper} from '../../facade/collection';
 import {DateWrapper, StringWrapper, isPresent, print, stringify} from '../../facade/lang';
 
 import {MessageBus} from './message_bus';
diff --git a/modules/@angular/platform-webworker/src/web_workers/worker/renderer.ts b/modules/@angular/platform-webworker/src/web_workers/worker/renderer.ts
index 6a66e53970e3..d55ae476c08b 100644
--- a/modules/@angular/platform-webworker/src/web_workers/worker/renderer.ts
+++ b/modules/@angular/platform-webworker/src/web_workers/worker/renderer.ts
@@ -9,7 +9,7 @@
 import {Injectable, RenderComponentType, Renderer, RootRenderer, ViewEncapsulation} from '@angular/core';
 
 import {ListWrapper} from '../../facade/collection';
-import {isBlank, isPresent} from '../../facade/lang';
+import {isPresent} from '../../facade/lang';
 import {AnimationKeyframe, AnimationPlayer, AnimationStyles, RenderDebugInfo} from '../../private_import_core';
 import {ClientMessageBrokerFactory, FnArg, UiArguments} from '../shared/client_message_broker';
 import {MessageBus} from '../shared/message_bus';
@@ -50,7 +50,7 @@ export class WebWorkerRootRenderer implements RootRenderer {
 
   renderComponent(componentType: RenderComponentType): Renderer {
     var result = this._componentRenderers.get(componentType.id);
-    if (isBlank(result)) {
+    if (!result) {
       result = new WebWorkerRenderer(this, componentType);
       this._componentRenderers.set(componentType.id, result);
       var id = this._renderStore.allocateId();
@@ -243,11 +243,11 @@ export class NamedEventEmitter {
   private _listeners: Map<string, Function[]>;
 
   private _getListeners(eventName: string): Function[] {
-    if (isBlank(this._listeners)) {
+    if (!this._listeners) {
       this._listeners = new Map<string, Function[]>();
     }
     var listeners = this._listeners.get(eventName);
-    if (isBlank(listeners)) {
+    if (!listeners) {
       listeners = [];
       this._listeners.set(eventName, listeners);
     }

From 3ee8c75effe3df5d3737608eecc516c0a36cf883 Mon Sep 17 00:00:00 2001
From: Connor Wyatt <connorwyatt1@gmail.com>
Date: Fri, 30 Sep 2016 17:42:54 +0100
Subject: [PATCH 37/70] refactor(routerLinkActive): optimised routerLinkActive
 active check code (#11968)

Modify routerLinkActive to optimise performance by removing unnecessary iteration. By replacing Array.reduce with Array.some, the loop will break when it finds an active link. Useful if used on the parent of a large group of routerLinks. Furthermore, if a RouterLink is active it will not check the RouterLinkWithHrefs.
---
 .../src/directives/router_link_active.ts      | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/modules/@angular/router/src/directives/router_link_active.ts b/modules/@angular/router/src/directives/router_link_active.ts
index e41c259f4da3..49867f5150f0 100644
--- a/modules/@angular/router/src/directives/router_link_active.ts
+++ b/modules/@angular/router/src/directives/router_link_active.ts
@@ -109,17 +109,18 @@ export class RouterLinkActive implements OnChanges, OnDestroy, AfterContentInit
   private update(): void {
     if (!this.links || !this.linksWithHrefs || !this.router.navigated) return;
 
-    const isActiveLinks = this.reduceList(this.links);
-    const isActiveLinksWithHrefs = this.reduceList(this.linksWithHrefs);
+    const isActive = this.hasActiveLink();
     this.classes.forEach(
-        c => this.renderer.setElementClass(
-            this.element.nativeElement, c, isActiveLinks || isActiveLinksWithHrefs));
+        c => this.renderer.setElementClass(this.element.nativeElement, c, isActive));
   }
 
-  private reduceList(q: QueryList<any>): boolean {
-    return q.reduce(
-        (res: boolean, link: any) =>
-            res || this.router.isActive(link.urlTree, this.routerLinkActiveOptions.exact),
-        false);
+  private isLinkActive(router: Router): (link: (RouterLink|RouterLinkWithHref)) => boolean {
+    return (link: RouterLink | RouterLinkWithHref) =>
+               router.isActive(link.urlTree, this.routerLinkActiveOptions.exact);
+  }
+
+  private hasActiveLink(): boolean {
+    return this.links.some(this.isLinkActive(this.router)) ||
+        this.linksWithHrefs.some(this.isLinkActive(this.router));
   }
 }

From 9cc0a4ed10f34d21724702f0ec610a0966524942 Mon Sep 17 00:00:00 2001
From: alexbyk <alexbyk@users.noreply.github.com>
Date: Fri, 30 Sep 2016 19:57:26 +0300
Subject: [PATCH 38/70] fix(UrlSearchParams): change a behavior when a param
 value is null or undefined (#11990)

---
 modules/@angular/http/src/url_search_params.ts |  5 +++++
 .../http/test/url_search_params_spec.ts        | 18 ++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/modules/@angular/http/src/url_search_params.ts b/modules/@angular/http/src/url_search_params.ts
index 7703f1c871f3..e750a5ecacf5 100644
--- a/modules/@angular/http/src/url_search_params.ts
+++ b/modules/@angular/http/src/url_search_params.ts
@@ -102,6 +102,10 @@ export class URLSearchParams {
   getAll(param: string): string[] { return this.paramsMap.get(param) || []; }
 
   set(param: string, val: string) {
+    if (val === void 0 || val === null) {
+      this.delete(param);
+      return;
+    }
     const list = this.paramsMap.get(param) || [];
     list.length = 0;
     list.push(val);
@@ -124,6 +128,7 @@ export class URLSearchParams {
   }
 
   append(param: string, val: string): void {
+    if (val === void 0 || val === null) return;
     const list = this.paramsMap.get(param) || [];
     list.push(val);
     this.paramsMap.set(param, list);
diff --git a/modules/@angular/http/test/url_search_params_spec.ts b/modules/@angular/http/test/url_search_params_spec.ts
index f075e9536bc4..336aa9e652af 100644
--- a/modules/@angular/http/test/url_search_params_spec.ts
+++ b/modules/@angular/http/test/url_search_params_spec.ts
@@ -149,5 +149,23 @@ export function main() {
       expect(paramsC.toString()).toEqual('a=2&q=4%2B&c=8');
     });
 
+    it('should remove the parameter when set to undefined or null', () => {
+      const params = new URLSearchParams('q=Q');
+      params.set('q', undefined);
+      expect(params.has('q')).toBe(false);
+      expect(params.toString()).toEqual('');
+      params.set('q', null);
+      expect(params.has('q')).toBe(false);
+      expect(params.toString()).toEqual('');
+    });
+
+    it('should ignore the value when append undefined or null', () => {
+      const params = new URLSearchParams('q=Q');
+      params.append('q', undefined);
+      expect(params.toString()).toEqual('q=Q');
+      params.append('q', null);
+      expect(params.toString()).toEqual('q=Q');
+    });
+
   });
 }

From f7864edd4b16549bc6cdd3e299070b9eca7b3b72 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Tue, 27 Sep 2016 15:41:37 -0700
Subject: [PATCH 39/70] refactor(DirectiveResolver): cleanup

---
 .../compiler/src/directive_resolver.ts        | 112 +++++++++---------
 .../compiler/test/directive_resolver_spec.ts  |  30 ++---
 2 files changed, 71 insertions(+), 71 deletions(-)

diff --git a/modules/@angular/compiler/src/directive_resolver.ts b/modules/@angular/compiler/src/directive_resolver.ts
index f01a86f3a43e..5b473c86a7ed 100644
--- a/modules/@angular/compiler/src/directive_resolver.ts
+++ b/modules/@angular/compiler/src/directive_resolver.ts
@@ -9,14 +9,10 @@
 import {Component, Directive, HostBinding, HostListener, Injectable, Input, Output, Query, Type, resolveForwardRef} from '@angular/core';
 
 import {StringMapWrapper} from './facade/collection';
-import {isPresent, stringify} from './facade/lang';
+import {stringify} from './facade/lang';
 import {ReflectorReader, reflector} from './private_import_core';
 import {splitAtColon} from './util';
 
-function _isDirectiveMetadata(type: any): type is Directive {
-  return type instanceof Directive;
-}
-
 /*
  * Resolve a `Type` for {@link Directive}.
  *
@@ -32,54 +28,57 @@ export class DirectiveResolver {
    * Return {@link Directive} for a given `Type`.
    */
   resolve(type: Type<any>, throwIfNotFound = true): Directive {
-    var typeMetadata = this._reflector.annotations(resolveForwardRef(type));
-    if (isPresent(typeMetadata)) {
-      var metadata = typeMetadata.find(_isDirectiveMetadata);
-      if (isPresent(metadata)) {
-        var propertyMetadata = this._reflector.propMetadata(type);
+    const typeMetadata = this._reflector.annotations(resolveForwardRef(type));
+    if (typeMetadata) {
+      const metadata = typeMetadata.find(isDirectiveMetadata);
+      if (metadata) {
+        const propertyMetadata = this._reflector.propMetadata(type);
         return this._mergeWithPropertyMetadata(metadata, propertyMetadata, type);
       }
     }
+
     if (throwIfNotFound) {
       throw new Error(`No Directive annotation found on ${stringify(type)}`);
     }
+
     return null;
   }
 
   private _mergeWithPropertyMetadata(
       dm: Directive, propertyMetadata: {[key: string]: any[]},
       directiveType: Type<any>): Directive {
-    var inputs: string[] = [];
-    var outputs: string[] = [];
-    var host: {[key: string]: string} = {};
-    var queries: {[key: string]: any} = {};
+    const inputs: string[] = [];
+    const outputs: string[] = [];
+    const host: {[key: string]: string} = {};
+    const queries: {[key: string]: any} = {};
+
+    Object.keys(propertyMetadata).forEach((propName: string) => {
 
-    StringMapWrapper.forEach(propertyMetadata, (metadata: any[], propName: string) => {
-      metadata.forEach(a => {
+      propertyMetadata[propName].forEach(a => {
         if (a instanceof Input) {
-          if (isPresent(a.bindingPropertyName)) {
+          if (a.bindingPropertyName) {
             inputs.push(`${propName}: ${a.bindingPropertyName}`);
           } else {
             inputs.push(propName);
           }
         } else if (a instanceof Output) {
           const output: Output = a;
-          if (isPresent(output.bindingPropertyName)) {
+          if (output.bindingPropertyName) {
             outputs.push(`${propName}: ${output.bindingPropertyName}`);
           } else {
             outputs.push(propName);
           }
         } else if (a instanceof HostBinding) {
           const hostBinding: HostBinding = a;
-          if (isPresent(hostBinding.hostPropertyName)) {
+          if (hostBinding.hostPropertyName) {
             host[`[${hostBinding.hostPropertyName}]`] = propName;
           } else {
             host[`[${propName}]`] = propName;
           }
         } else if (a instanceof HostListener) {
           const hostListener: HostListener = a;
-          var args = isPresent(hostListener.args) ? (<any[]>hostListener.args).join(', ') : '';
-          host[`(${hostListener.eventName})`] = `${propName}(${args})`;
+          const args = hostListener.args || [];
+          host[`(${hostListener.eventName})`] = `${propName}(${args.join(',')})`;
         } else if (a instanceof Query) {
           queries[propName] = a;
         }
@@ -91,13 +90,14 @@ export class DirectiveResolver {
   private _extractPublicName(def: string) { return splitAtColon(def, [null, def])[1].trim(); }
 
   private _merge(
-      dm: Directive, inputs: string[], outputs: string[], host: {[key: string]: string},
+      directive: Directive, inputs: string[], outputs: string[], host: {[key: string]: string},
       queries: {[key: string]: any}, directiveType: Type<any>): Directive {
-    let mergedInputs: string[];
+    const mergedInputs: string[] = inputs;
 
-    if (isPresent(dm.inputs)) {
+    if (directive.inputs) {
       const inputNames: string[] =
-          dm.inputs.map((def: string): string => this._extractPublicName(def));
+          directive.inputs.map((def: string): string => this._extractPublicName(def));
+
       inputs.forEach((inputDef: string) => {
         const publicName = this._extractPublicName(inputDef);
         if (inputNames.indexOf(publicName) > -1) {
@@ -105,16 +105,15 @@ export class DirectiveResolver {
               `Input '${publicName}' defined multiple times in '${stringify(directiveType)}'`);
         }
       });
-      mergedInputs = dm.inputs.concat(inputs);
-    } else {
-      mergedInputs = inputs;
+
+      mergedInputs.unshift(...directive.inputs);
     }
 
-    let mergedOutputs: string[];
+    let mergedOutputs: string[] = outputs;
 
-    if (isPresent(dm.outputs)) {
+    if (directive.outputs) {
       const outputNames: string[] =
-          dm.outputs.map((def: string): string => this._extractPublicName(def));
+          directive.outputs.map((def: string): string => this._extractPublicName(def));
 
       outputs.forEach((outputDef: string) => {
         const publicName = this._extractPublicName(outputDef);
@@ -123,47 +122,48 @@ export class DirectiveResolver {
               `Output event '${publicName}' defined multiple times in '${stringify(directiveType)}'`);
         }
       });
-      mergedOutputs = dm.outputs.concat(outputs);
-    } else {
-      mergedOutputs = outputs;
+      mergedOutputs.unshift(...directive.outputs);
     }
 
-    var mergedHost = isPresent(dm.host) ? StringMapWrapper.merge(dm.host, host) : host;
-    var mergedQueries =
-        isPresent(dm.queries) ? StringMapWrapper.merge(dm.queries, queries) : queries;
+    const mergedHost = directive.host ? StringMapWrapper.merge(directive.host, host) : host;
+    const mergedQueries =
+        directive.queries ? StringMapWrapper.merge(directive.queries, queries) : queries;
 
-    if (dm instanceof Component) {
+    if (directive instanceof Component) {
       return new Component({
-        selector: dm.selector,
+        selector: directive.selector,
         inputs: mergedInputs,
         outputs: mergedOutputs,
         host: mergedHost,
-        exportAs: dm.exportAs,
-        moduleId: dm.moduleId,
+        exportAs: directive.exportAs,
+        moduleId: directive.moduleId,
         queries: mergedQueries,
-        changeDetection: dm.changeDetection,
-        providers: dm.providers,
-        viewProviders: dm.viewProviders,
-        entryComponents: dm.entryComponents,
-        template: dm.template,
-        templateUrl: dm.templateUrl,
-        styles: dm.styles,
-        styleUrls: dm.styleUrls,
-        encapsulation: dm.encapsulation,
-        animations: dm.animations,
-        interpolation: dm.interpolation
+        changeDetection: directive.changeDetection,
+        providers: directive.providers,
+        viewProviders: directive.viewProviders,
+        entryComponents: directive.entryComponents,
+        template: directive.template,
+        templateUrl: directive.templateUrl,
+        styles: directive.styles,
+        styleUrls: directive.styleUrls,
+        encapsulation: directive.encapsulation,
+        animations: directive.animations,
+        interpolation: directive.interpolation
       });
-
     } else {
       return new Directive({
-        selector: dm.selector,
+        selector: directive.selector,
         inputs: mergedInputs,
         outputs: mergedOutputs,
         host: mergedHost,
-        exportAs: dm.exportAs,
+        exportAs: directive.exportAs,
         queries: mergedQueries,
-        providers: dm.providers
+        providers: directive.providers
       });
     }
   }
 }
+
+function isDirectiveMetadata(type: any): type is Directive {
+  return type instanceof Directive;
+}
diff --git a/modules/@angular/compiler/test/directive_resolver_spec.ts b/modules/@angular/compiler/test/directive_resolver_spec.ts
index 28b4552435c6..d139eaf8414b 100644
--- a/modules/@angular/compiler/test/directive_resolver_spec.ts
+++ b/modules/@angular/compiler/test/directive_resolver_spec.ts
@@ -112,12 +112,12 @@ class SomeDirectiveWithoutMetadata {}
 
 export function main() {
   describe('DirectiveResolver', () => {
-    var resolver: DirectiveResolver;
+    let resolver: DirectiveResolver;
 
     beforeEach(() => { resolver = new DirectiveResolver(); });
 
     it('should read out the Directive metadata', () => {
-      var directiveMetadata = resolver.resolve(SomeDirective);
+      const directiveMetadata = resolver.resolve(SomeDirective);
       expect(directiveMetadata)
           .toEqual(new Directive(
               {selector: 'someDirective', inputs: [], outputs: [], host: {}, queries: {}}));
@@ -130,7 +130,7 @@ export function main() {
     });
 
     it('should not read parent class Directive metadata', function() {
-      var directiveMetadata = resolver.resolve(SomeChildDirective);
+      const directiveMetadata = resolver.resolve(SomeChildDirective);
       expect(directiveMetadata)
           .toEqual(new Directive(
               {selector: 'someChildDirective', inputs: [], outputs: [], host: {}, queries: {}}));
@@ -138,12 +138,12 @@ export function main() {
 
     describe('inputs', () => {
       it('should append directive inputs', () => {
-        var directiveMetadata = resolver.resolve(SomeDirectiveWithInputs);
+        const directiveMetadata = resolver.resolve(SomeDirectiveWithInputs);
         expect(directiveMetadata.inputs).toEqual(['c', 'a', 'b: renamed']);
       });
 
       it('should work with getters and setters', () => {
-        var directiveMetadata = resolver.resolve(SomeDirectiveWithSetterProps);
+        const directiveMetadata = resolver.resolve(SomeDirectiveWithSetterProps);
         expect(directiveMetadata.inputs).toEqual(['a: renamed']);
       });
 
@@ -162,12 +162,12 @@ export function main() {
 
     describe('outputs', () => {
       it('should append directive outputs', () => {
-        var directiveMetadata = resolver.resolve(SomeDirectiveWithOutputs);
+        const directiveMetadata = resolver.resolve(SomeDirectiveWithOutputs);
         expect(directiveMetadata.outputs).toEqual(['c', 'a', 'b: renamed']);
       });
 
       it('should work with getters and setters', () => {
-        var directiveMetadata = resolver.resolve(SomeDirectiveWithGetterOutputs);
+        const directiveMetadata = resolver.resolve(SomeDirectiveWithGetterOutputs);
         expect(directiveMetadata.outputs).toEqual(['a: renamed']);
       });
 
@@ -186,12 +186,12 @@ export function main() {
 
     describe('host', () => {
       it('should append host bindings', () => {
-        var directiveMetadata = resolver.resolve(SomeDirectiveWithHostBindings);
+        const directiveMetadata = resolver.resolve(SomeDirectiveWithHostBindings);
         expect(directiveMetadata.host).toEqual({'[c]': 'c', '[a]': 'a', '[renamed]': 'b'});
       });
 
       it('should append host listeners', () => {
-        var directiveMetadata = resolver.resolve(SomeDirectiveWithHostListeners);
+        const directiveMetadata = resolver.resolve(SomeDirectiveWithHostListeners);
         expect(directiveMetadata.host)
             .toEqual({'(c)': 'onC()', '(a)': 'onA()', '(b)': 'onB($event.value)'});
       });
@@ -199,33 +199,33 @@ export function main() {
 
     describe('queries', () => {
       it('should append ContentChildren', () => {
-        var directiveMetadata = resolver.resolve(SomeDirectiveWithContentChildren);
+        const directiveMetadata = resolver.resolve(SomeDirectiveWithContentChildren);
         expect(directiveMetadata.queries)
             .toEqual({'cs': new ContentChildren('c'), 'as': new ContentChildren('a')});
       });
 
       it('should append ViewChildren', () => {
-        var directiveMetadata = resolver.resolve(SomeDirectiveWithViewChildren);
+        const directiveMetadata = resolver.resolve(SomeDirectiveWithViewChildren);
         expect(directiveMetadata.queries)
             .toEqual({'cs': new ViewChildren('c'), 'as': new ViewChildren('a')});
       });
 
       it('should append ContentChild', () => {
-        var directiveMetadata = resolver.resolve(SomeDirectiveWithContentChild);
+        const directiveMetadata = resolver.resolve(SomeDirectiveWithContentChild);
         expect(directiveMetadata.queries)
             .toEqual({'c': new ContentChild('c'), 'a': new ContentChild('a')});
       });
 
       it('should append ViewChild', () => {
-        var directiveMetadata = resolver.resolve(SomeDirectiveWithViewChild);
+        const directiveMetadata = resolver.resolve(SomeDirectiveWithViewChild);
         expect(directiveMetadata.queries)
             .toEqual({'c': new ViewChild('c'), 'a': new ViewChild('a')});
       });
     });
 
-    describe('view', () => {
+    describe('Component', () => {
       it('should read out the template related metadata from the Component metadata', () => {
-        var compMetadata = <Component>resolver.resolve(ComponentWithTemplate);
+        const compMetadata: Component = resolver.resolve(ComponentWithTemplate);
         expect(compMetadata.template).toEqual('some template');
         expect(compMetadata.styles).toEqual(['some styles']);
       });

From d0dea574cb104cc0b7a11ad9d855a9814dd6e83d Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Tue, 27 Sep 2016 16:07:01 -0700
Subject: [PATCH 40/70] test(DirectiveResolver): test that a prop can have both
 `@Input` and `@HostBinding`

---
 .../compiler/test/directive_resolver_spec.ts      | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/modules/@angular/compiler/test/directive_resolver_spec.ts b/modules/@angular/compiler/test/directive_resolver_spec.ts
index d139eaf8414b..7e75be9e1d71 100644
--- a/modules/@angular/compiler/test/directive_resolver_spec.ts
+++ b/modules/@angular/compiler/test/directive_resolver_spec.ts
@@ -108,6 +108,15 @@ class SomeDirectiveWithViewChild {
 class ComponentWithTemplate {
 }
 
+@Directive({
+  selector: 'someDirective',
+  host: {'[decorator]': 'decorator'},
+  inputs: ['decorator'],
+})
+class SomeDirectiveWithSameHostBindingAndInput {
+  @Input() @HostBinding() prop: any;
+}
+
 class SomeDirectiveWithoutMetadata {}
 
 export function main() {
@@ -190,6 +199,12 @@ export function main() {
         expect(directiveMetadata.host).toEqual({'[c]': 'c', '[a]': 'a', '[renamed]': 'b'});
       });
 
+      it('should append host binding and input on the same property', () => {
+        const directiveMetadata = resolver.resolve(SomeDirectiveWithSameHostBindingAndInput);
+        expect(directiveMetadata.host).toEqual({'[decorator]': 'decorator', '[prop]': 'prop'});
+        expect(directiveMetadata.inputs).toEqual(['decorator', 'prop']);
+      });
+
       it('should append host listeners', () => {
         const directiveMetadata = resolver.resolve(SomeDirectiveWithHostListeners);
         expect(directiveMetadata.host)

From 2dd399658d0472aafa98b1815a469fbcdc7e8dcc Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Mon, 26 Sep 2016 09:31:45 -0700
Subject: [PATCH 41/70] refactor(ShadowCss): cleanup

---
 modules/@angular/compiler/src/shadow_css.ts   | 90 +++++++++----------
 .../@angular/compiler/test/shadow_css_spec.ts |  1 -
 2 files changed, 40 insertions(+), 51 deletions(-)

diff --git a/modules/@angular/compiler/src/shadow_css.ts b/modules/@angular/compiler/src/shadow_css.ts
index 03ab00b165a7..cd06b95147e9 100644
--- a/modules/@angular/compiler/src/shadow_css.ts
+++ b/modules/@angular/compiler/src/shadow_css.ts
@@ -6,8 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {StringWrapper, isBlank, isPresent} from './facade/lang';
-
 /**
  * This file is a port of shadowCSS from webcomponents.js to TypeScript.
  *
@@ -175,9 +173,8 @@ export class ShadowCss {
   **/
   private _insertPolyfillDirectivesInCssText(cssText: string): string {
     // Difference with webcomponents.js: does not handle comments
-    return StringWrapper.replaceAllMapped(
-        cssText, _cssContentNextSelectorRe,
-        function(m: any /** TODO #9100 */) { return m[1] + '{'; });
+    return cssText.replace(
+        _cssContentNextSelectorRe, function(...m: string[]) { return m[1] + '{'; });
   }
 
   /*
@@ -197,13 +194,10 @@ export class ShadowCss {
   **/
   private _insertPolyfillRulesInCssText(cssText: string): string {
     // Difference with webcomponents.js: does not handle comments
-    return StringWrapper.replaceAllMapped(
-        cssText, _cssContentRuleRe, function(m: any /** TODO #9100 */) {
-          let rule = m[0];
-          rule = StringWrapper.replace(rule, m[1], '');
-          rule = StringWrapper.replace(rule, m[2], '');
-          return m[3] + rule;
-        });
+    return cssText.replace(_cssContentRuleRe, (...m: string[]) => {
+      const rule = m[0].replace(m[1], '').replace(m[2], '');
+      return m[3] + rule;
+    });
   }
 
   /* Ensure styles are scoped. Pseudo-scoping takes a rule like:
@@ -220,7 +214,7 @@ export class ShadowCss {
     cssText = this._convertColonHost(cssText);
     cssText = this._convertColonHostContext(cssText);
     cssText = this._convertShadowDOMSelectors(cssText);
-    if (isPresent(scopeSelector)) {
+    if (scopeSelector) {
       cssText = this._scopeSelectors(cssText, scopeSelector, hostSelector);
     }
     cssText = cssText + '\n' + unscoped;
@@ -248,9 +242,7 @@ export class ShadowCss {
     let m: RegExpExecArray;
     _cssContentUnscopedRuleRe.lastIndex = 0;
     while ((m = _cssContentUnscopedRuleRe.exec(cssText)) !== null) {
-      let rule = m[0];
-      rule = StringWrapper.replace(rule, m[2], '');
-      rule = StringWrapper.replace(rule, m[1], m[3]);
+      const rule = m[0].replace(m[2], '').replace(m[1], m[3]);
       r += rule + '\n\n';
     }
     return r;
@@ -289,14 +281,14 @@ export class ShadowCss {
 
   private _convertColonRule(cssText: string, regExp: RegExp, partReplacer: Function): string {
     // p1 = :host, p2 = contents of (), p3 rest of rule
-    return StringWrapper.replaceAllMapped(cssText, regExp, function(m: any /** TODO #9100 */) {
-      if (isPresent(m[2])) {
-        const parts = m[2].split(','), r: any[] /** TODO #9100 */ = [];
+    return cssText.replace(regExp, function(...m: string[]) {
+      if (m[2]) {
+        const parts = m[2].split(',');
+        const r: string[] = [];
         for (let i = 0; i < parts.length; i++) {
           let p = parts[i];
-          if (isBlank(p)) break;
-          p = p.trim();
-          r.push(partReplacer(_polyfillHostNoCombinator, p, m[3]));
+          if (!p) break;
+          r.push(partReplacer(_polyfillHostNoCombinator, p.trim(), m[3]));
         }
         return r.join(',');
       } else {
@@ -306,7 +298,7 @@ export class ShadowCss {
   }
 
   private _colonHostContextPartReplacer(host: string, part: string, suffix: string): string {
-    if (StringWrapper.contains(part, _polyfillHost)) {
+    if (part.indexOf(_polyfillHost) > -1) {
       return this._colonHostPartReplacer(host, part, suffix);
     } else {
       return host + part + suffix + ', ' + part + ' ' + host + suffix;
@@ -314,7 +306,7 @@ export class ShadowCss {
   }
 
   private _colonHostPartReplacer(host: string, part: string, suffix: string): string {
-    return host + StringWrapper.replace(part, _polyfillHost, '') + suffix;
+    return host + part.replace(_polyfillHost, '') + suffix;
   }
 
   /*
@@ -323,7 +315,7 @@ export class ShadowCss {
   */
   private _convertShadowDOMSelectors(cssText: string): string {
     return _shadowDOMSelectorsRe.reduce(
-        (result, pattern) => { return StringWrapper.replaceAll(result, pattern, ' '); }, cssText);
+        (result, pattern) => { return result.replace(pattern, ' '); }, cssText);
   }
 
   // change a selector like 'div' to 'name div'
@@ -369,8 +361,7 @@ export class ShadowCss {
   private _makeScopeMatcher(scopeSelector: string): RegExp {
     const lre = /\[/g;
     const rre = /\]/g;
-    scopeSelector = StringWrapper.replaceAll(scopeSelector, lre, '\\[');
-    scopeSelector = StringWrapper.replaceAll(scopeSelector, rre, '\\]');
+    scopeSelector = scopeSelector.replace(lre, '\\[').replace(rre, '\\]');
     return new RegExp('^(' + scopeSelector + ')' + _selectorReSuffix, 'm');
   }
 
@@ -387,8 +378,8 @@ export class ShadowCss {
     _polyfillHostRe.lastIndex = 0;
     if (_polyfillHostRe.test(selector)) {
       const replaceBy = this.strictStyling ? `[${hostSelector}]` : scopeSelector;
-      selector = StringWrapper.replace(selector, _polyfillHostNoCombinator, replaceBy);
-      return StringWrapper.replaceAll(selector, _polyfillHostRe, replaceBy + ' ');
+      return selector.replace(_polyfillHostNoCombinator, replaceBy)
+          .replace(_polyfillHostRe, replaceBy + ' ');
     } else {
       return scopeSelector + ' ' + selector;
     }
@@ -404,9 +395,9 @@ export class ShadowCss {
     const attrName = '[' + scopeSelector + ']';
 
     const _scopeSelectorPart = (p: string) => {
-      var scopedP = p.trim();
+      let scopedP = p.trim();
 
-      if (scopedP.length == 0) {
+      if (!scopedP) {
         return '';
       }
 
@@ -480,7 +471,7 @@ const _colonHostContextRe = /:host-context/gim;
 const _commentRe = /\/\*\s*[\s\S]*?\*\//g;
 
 function stripComments(input: string): string {
-  return StringWrapper.replaceAllMapped(input, _commentRe, (_: any /** TODO #9100 */) => '');
+  return input.replace(_commentRe, '');
 }
 
 // all comments except inline source mapping
@@ -504,20 +495,19 @@ export class CssRule {
 export function processRules(input: string, ruleCallback: Function): string {
   const inputWithEscapedBlocks = escapeBlocks(input);
   let nextBlockIndex = 0;
-  return StringWrapper.replaceAllMapped(
-      inputWithEscapedBlocks.escapedString, _ruleRe, function(m: any /** TODO #9100 */) {
-        const selector = m[2];
-        let content = '';
-        let suffix = m[4];
-        let contentPrefix = '';
-        if (isPresent(m[4]) && m[4].startsWith('{' + BLOCK_PLACEHOLDER)) {
-          content = inputWithEscapedBlocks.blocks[nextBlockIndex++];
-          suffix = m[4].substring(BLOCK_PLACEHOLDER.length + 1);
-          contentPrefix = '{';
-        }
-        const rule = ruleCallback(new CssRule(selector, content));
-        return `${m[1]}${rule.selector}${m[3]}${contentPrefix}${rule.content}${suffix}`;
-      });
+  return inputWithEscapedBlocks.escapedString.replace(_ruleRe, function(...m: string[]) {
+    const selector = m[2];
+    let content = '';
+    let suffix = m[4];
+    let contentPrefix = '';
+    if (suffix && suffix.startsWith('{' + BLOCK_PLACEHOLDER)) {
+      content = inputWithEscapedBlocks.blocks[nextBlockIndex++];
+      suffix = suffix.substring(BLOCK_PLACEHOLDER.length + 1);
+      contentPrefix = '{';
+    }
+    const rule = ruleCallback(new CssRule(selector, content));
+    return `${m[1]}${rule.selector}${m[3]}${contentPrefix}${rule.content}${suffix}`;
+  });
 }
 
 class StringWithEscapedBlocks {
@@ -525,11 +515,11 @@ class StringWithEscapedBlocks {
 }
 
 function escapeBlocks(input: string): StringWithEscapedBlocks {
-  const inputParts = StringWrapper.split(input, _curlyRe);
-  const resultParts: any[] /** TODO #9100 */ = [];
-  const escapedBlocks: any[] /** TODO #9100 */ = [];
+  const inputParts = input.split(_curlyRe);
+  const resultParts: string[] = [];
+  const escapedBlocks: string[] = [];
   let bracketCount = 0;
-  let currentBlockParts: any[] /** TODO #9100 */ = [];
+  let currentBlockParts: string[] = [];
   for (let partIndex = 0; partIndex < inputParts.length; partIndex++) {
     const part = inputParts[partIndex];
     if (part == CLOSE_CURLY) {
diff --git a/modules/@angular/compiler/test/shadow_css_spec.ts b/modules/@angular/compiler/test/shadow_css_spec.ts
index 7a50429f5f47..e91a271753d9 100644
--- a/modules/@angular/compiler/test/shadow_css_spec.ts
+++ b/modules/@angular/compiler/test/shadow_css_spec.ts
@@ -7,7 +7,6 @@
  */
 
 import {CssRule, ShadowCss, processRules} from '@angular/compiler/src/shadow_css';
-import {describe, expect, it} from '@angular/core/testing/testing_internal';
 import {normalizeCSS} from '@angular/platform-browser/testing/browser_util';
 
 export function main() {

From bd012efcc417bc4015962df7910b157de8a034ce Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Mon, 26 Sep 2016 09:55:05 -0700
Subject: [PATCH 42/70] fix(ShadowCss): support `[attr="value with space"]`

fixes #6249
---
 modules/@angular/compiler/src/shadow_css.ts   | 28 ++++++++++++++-----
 .../@angular/compiler/test/shadow_css_spec.ts |  1 +
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/modules/@angular/compiler/src/shadow_css.ts b/modules/@angular/compiler/src/shadow_css.ts
index cd06b95147e9..98d31c4b9ff2 100644
--- a/modules/@angular/compiler/src/shadow_css.ts
+++ b/modules/@angular/compiler/src/shadow_css.ts
@@ -417,21 +417,35 @@ export class ShadowCss {
       return scopedP;
     };
 
-    const sep = /( |>|\+|~(?!=))\s*/g;
+    const sep = /( |>|\+|~(?!=)|\[|\])\s*/g;
     const scopeAfter = selector.indexOf(_polyfillHostNoCombinator);
 
     let scoped = '';
     let startIndex = 0;
     let res: RegExpExecArray;
+    let inAttributeSelector: boolean = false;
 
     while ((res = sep.exec(selector)) !== null) {
       const separator = res[1];
-      const part = selector.slice(startIndex, res.index).trim();
-      // if a selector appears before :host-context it should not be shimmed as it
-      // matches on ancestor elements and not on elements in the host's shadow
-      const scopedPart = startIndex >= scopeAfter ? _scopeSelectorPart(part) : part;
-      scoped += `${scopedPart} ${separator} `;
-      startIndex = sep.lastIndex;
+      if (separator === '[') {
+        inAttributeSelector = true;
+        scoped += selector.slice(startIndex, res.index).trim() + '[';
+        startIndex = sep.lastIndex;
+      }
+      if (!inAttributeSelector) {
+        const part = selector.slice(startIndex, res.index).trim();
+        // if a selector appears before :host-context it should not be shimmed as it
+        // matches on ancestor elements and not on elements in the host's shadow
+        const scopedPart = startIndex >= scopeAfter ? _scopeSelectorPart(part) : part;
+        scoped += `${scopedPart} ${separator} `;
+        startIndex = sep.lastIndex;
+      } else if (separator === ']') {
+        const part = selector.slice(startIndex, res.index).trim() + ']';
+        const scopedPart = startIndex >= scopeAfter ? _scopeSelectorPart(part) : part;
+        scoped += `${scopedPart} `;
+        startIndex = sep.lastIndex;
+        inAttributeSelector = false;
+      }
     }
     return scoped + _scopeSelectorPart(selector.substring(startIndex));
   }
diff --git a/modules/@angular/compiler/test/shadow_css_spec.ts b/modules/@angular/compiler/test/shadow_css_spec.ts
index e91a271753d9..c974412dc94a 100644
--- a/modules/@angular/compiler/test/shadow_css_spec.ts
+++ b/modules/@angular/compiler/test/shadow_css_spec.ts
@@ -91,6 +91,7 @@ export function main() {
       expect(s('one[attr*="value"] {}', 'a')).toEqual('one[attr*="value"][a] {}');
       expect(s('one[attr|="value"] {}', 'a')).toEqual('one[attr|="value"][a] {}');
       expect(s('one[attr~="value"] {}', 'a')).toEqual('one[attr~="value"][a] {}');
+      expect(s('one[attr="va lue"] {}', 'a')).toEqual('one[attr="va lue"][a] {}');
       expect(s('one[attr] {}', 'a')).toEqual('one[attr][a] {}');
       expect(s('[is="one"] {}', 'a')).toEqual('[is="one"][a] {}');
     });

From 69709915461afe8724eb16ef42067d416a823f18 Mon Sep 17 00:00:00 2001
From: Tobias Bosch <tbosch1009@gmail.com>
Date: Fri, 30 Sep 2016 09:11:39 -0700
Subject: [PATCH 43/70] docs: update docs for ng2_ftl benchmark

---
 modules/benchmarks/src/tree/ng2_ftl/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/benchmarks/src/tree/ng2_ftl/README.md b/modules/benchmarks/src/tree/ng2_ftl/README.md
index 14b8cb004256..5741f5a6dd0b 100644
--- a/modules/benchmarks/src/tree/ng2_ftl/README.md
+++ b/modules/benchmarks/src/tree/ng2_ftl/README.md
@@ -155,7 +155,7 @@ ng2.ftl         |       584.50+-435% |         0.43+-435% |         0.00+-435% |
 baseline        |               0.00 |               0.00 |               0.00 |          15.83+-7% |          45.75+-4% |          15.83+-7%
 incremental_dom |       100.82+-302% |         1.64+-321% |         0.00+-304% |          53.43+-9% |          43.96+-4% |         55.07+-13%
 
-...update                   gcAmount |             gcTime |        majorGcTime |     pureScriptTime |         renderTime |         scriptTime
+...update       |           gcAmount |             gcTime |        majorGcTime |     pureScriptTime |         renderTime |         scriptTime
 --------------- | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------
 ng2             |               0.00 |         0.00+-435% |         0.00+-435% |          22.82+-9% |          29.52+-6% |          22.82+-9%
 ng2.ftl         |       219.72+-301% |         0.97+-300% |         0.00+-302% |         17.37+-10% |          29.27+-5% |         17.37+-10%

From 9bacb32ec57599efe6dd03a43f32871cd7f5ea02 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Mon, 26 Sep 2016 11:01:12 -0700
Subject: [PATCH 44/70] feat(Parse5): update to the latest version 2.2.1

fixes #6237
---
 modules/@angular/compiler-cli/package.json    |   2 +-
 modules/@angular/platform-server/package.json |   2 +-
 .../platform-server/src/parse5_adapter.ts     | 460 ++++++++----------
 npm-shrinkwrap.clean.json                     |   4 +-
 npm-shrinkwrap.json                           |   8 +-
 package.json                                  |   2 +-
 test-main.js                                  |   2 +-
 7 files changed, 219 insertions(+), 261 deletions(-)

diff --git a/modules/@angular/compiler-cli/package.json b/modules/@angular/compiler-cli/package.json
index 85ed03595d0b..9cf0d04f6952 100644
--- a/modules/@angular/compiler-cli/package.json
+++ b/modules/@angular/compiler-cli/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "@angular/tsc-wrapped": "^0.3.0",
     "reflect-metadata": "^0.1.2",
-    "parse5": "1.3.2",
+    "parse5": "^2.2.1",
     "minimist": "^1.2.0"
   },
   "peerDependencies": {
diff --git a/modules/@angular/platform-server/package.json b/modules/@angular/platform-server/package.json
index 4bb63dbada38..9746b8016770 100644
--- a/modules/@angular/platform-server/package.json
+++ b/modules/@angular/platform-server/package.json
@@ -14,7 +14,7 @@
     "@angular/platform-browser": "0.0.0-PLACEHOLDER"
   },
   "dependencies": {
-    "parse5": "1.3.2"
+    "parse5": "^2.2.1"
   },
   "repository": {
     "type": "git",
diff --git a/modules/@angular/platform-server/src/parse5_adapter.ts b/modules/@angular/platform-server/src/parse5_adapter.ts
index 35c4969e3949..44228eb65a0d 100644
--- a/modules/@angular/platform-server/src/parse5_adapter.ts
+++ b/modules/@angular/platform-server/src/parse5_adapter.ts
@@ -6,28 +6,27 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-var parse5 = require('parse5/index');
+const parse5 = require('parse5');
 
 import {ListWrapper, StringMapWrapper} from '../src/facade/collection';
 import {DomAdapter, setRootDomAdapter} from './private_import_platform-browser';
-import {isPresent, isBlank, global, setValueOnPath, DateWrapper} from '../src/facade/lang';
+import {isPresent, isBlank, global, setValueOnPath} from '../src/facade/lang';
 import {SelectorMatcher, CssSelector} from './private_import_compiler';
 
-var parser: any /** TODO #9100 */ = null;
-var serializer: any /** TODO #9100 */ = null;
-var treeAdapter: any /** TODO #9100 */ = null;
+let treeAdapter: any;
 
-var _attrToPropMap: {[key: string]: string} = {
+const _attrToPropMap: {[key: string]: string} = {
   'class': 'className',
   'innerHtml': 'innerHTML',
   'readonly': 'readOnly',
   'tabindex': 'tabIndex',
 };
-var defDoc: any /** TODO #9100 */ = null;
 
-var mapProps = ['attribs', 'x-attribsNamespace', 'x-attribsPrefix'];
+let defDoc: any = null;
 
-function _notImplemented(methodName: any /** TODO #9100 */) {
+const mapProps = ['attribs', 'x-attribsNamespace', 'x-attribsPrefix'];
+
+function _notImplemented(methodName: string) {
   return new Error('This method is not implemented in Parse5DomAdapter: ' + methodName);
 }
 
@@ -40,18 +39,16 @@ function _notImplemented(methodName: any /** TODO #9100 */) {
  */
 export class Parse5DomAdapter extends DomAdapter {
   static makeCurrent() {
-    parser = new parse5.Parser(parse5.TreeAdapters.htmlparser2);
-    serializer = new parse5.Serializer(parse5.TreeAdapters.htmlparser2);
-    treeAdapter = parser.treeAdapter;
+    treeAdapter = parse5.treeAdapters.htmlparser2;
     setRootDomAdapter(new Parse5DomAdapter());
   }
 
-  hasProperty(element: any /** TODO #9100 */, name: string): boolean {
+  hasProperty(element: any, name: string): boolean {
     return _HTMLElementPropertyList.indexOf(name) > -1;
   }
   // TODO(tbosch): don't even call this method when we run the tests on server side
   // by not using the DomRenderer in tests. Keeping this for now to make tests happy...
-  setProperty(el: /*element*/ any, name: string, value: any) {
+  setProperty(el: any, name: string, value: any) {
     if (name === 'innerHTML') {
       this.setInnerHTML(el, value);
     } else if (name === 'className') {
@@ -62,173 +59,158 @@ export class Parse5DomAdapter extends DomAdapter {
   }
   // TODO(tbosch): don't even call this method when we run the tests on server side
   // by not using the DomRenderer in tests. Keeping this for now to make tests happy...
-  getProperty(el: /*element*/ any, name: string): any { return el[name]; }
+  getProperty(el: any, name: string): any { return el[name]; }
 
-  logError(error: any /** TODO #9100 */) { console.error(error); }
+  logError(error: string) { console.error(error); }
 
-  log(error: any /** TODO #9100 */) { console.log(error); }
+  log(error: string) { console.log(error); }
 
-  logGroup(error: any /** TODO #9100 */) { console.error(error); }
+  logGroup(error: string) { console.error(error); }
 
   logGroupEnd() {}
 
   get attrToPropMap() { return _attrToPropMap; }
 
-  query(selector: any /** TODO #9100 */) { throw _notImplemented('query'); }
-  querySelector(el: any /** TODO #9100 */, selector: string): any {
-    return this.querySelectorAll(el, selector)[0];
-  }
-  querySelectorAll(el: any /** TODO #9100 */, selector: string): any[] {
-    var res: any[] /** TODO #9100 */ = [];
-    var _recursive =
-        (result: any /** TODO #9100 */, node: any /** TODO #9100 */,
-         selector: any /** TODO #9100 */, matcher: any /** TODO #9100 */) => {
-          var cNodes = node.childNodes;
-          if (cNodes && cNodes.length > 0) {
-            for (var i = 0; i < cNodes.length; i++) {
-              var childNode = cNodes[i];
-              if (this.elementMatches(childNode, selector, matcher)) {
-                result.push(childNode);
-              }
-              _recursive(result, childNode, selector, matcher);
-            }
+  query(selector: any) { throw _notImplemented('query'); }
+  querySelector(el: any, selector: string): any { return this.querySelectorAll(el, selector)[0]; }
+  querySelectorAll(el: any, selector: string): any[] {
+    const res: any[] = [];
+    const _recursive = (result: any, node: any, selector: any, matcher: any) => {
+      let cNodes = node.childNodes;
+      if (cNodes && cNodes.length > 0) {
+        for (let i = 0; i < cNodes.length; i++) {
+          const childNode = cNodes[i];
+          if (this.elementMatches(childNode, selector, matcher)) {
+            result.push(childNode);
           }
-        };
-    var matcher = new SelectorMatcher();
+          _recursive(result, childNode, selector, matcher);
+        }
+      }
+    };
+    const matcher = new SelectorMatcher();
     matcher.addSelectables(CssSelector.parse(selector));
     _recursive(res, el, selector, matcher);
     return res;
   }
-  elementMatches(
-      node: any /** TODO #9100 */, selector: string,
-      matcher: any /** TODO #9100 */ = null): boolean {
+  elementMatches(node: any, selector: string, matcher: any = null): boolean {
     if (this.isElementNode(node) && selector === '*') {
       return true;
     }
-    var result = false;
+    let result = false;
     if (selector && selector.charAt(0) == '#') {
       result = this.getAttribute(node, 'id') == selector.substring(1);
     } else if (selector) {
-      var result = false;
-      if (matcher == null) {
+      if (!matcher) {
         matcher = new SelectorMatcher();
         matcher.addSelectables(CssSelector.parse(selector));
       }
 
-      var cssSelector = new CssSelector();
+      const cssSelector = new CssSelector();
       cssSelector.setElement(this.tagName(node));
       if (node.attribs) {
-        for (var attrName in node.attribs) {
+        for (const attrName in node.attribs) {
           cssSelector.addAttribute(attrName, node.attribs[attrName]);
         }
       }
-      var classList = this.classList(node);
-      for (var i = 0; i < classList.length; i++) {
+      const classList = this.classList(node);
+      for (let i = 0; i < classList.length; i++) {
         cssSelector.addClassName(classList[i]);
       }
 
-      matcher.match(
-          cssSelector,
-          function(selector: any /** TODO #9100 */, cb: any /** TODO #9100 */) { result = true; });
+      matcher.match(cssSelector, function(selector: any, cb: any) { result = true; });
     }
     return result;
   }
-  on(el: any /** TODO #9100 */, evt: any /** TODO #9100 */, listener: any /** TODO #9100 */) {
-    var listenersMap: {[k: string]: any} = el._eventListenersMap;
+  on(el: any, evt: any, listener: any) {
+    let listenersMap: {[k: string]: any} = el._eventListenersMap;
     if (!listenersMap) {
-      var listenersMap: {[k: string]: any} = {};
+      listenersMap = {};
       el._eventListenersMap = listenersMap;
     }
     const listeners = listenersMap[evt] || [];
     listenersMap[evt] = [...listeners, listener];
   }
-  onAndCancel(
-      el: any /** TODO #9100 */, evt: any /** TODO #9100 */,
-      listener: any /** TODO #9100 */): Function {
+  onAndCancel(el: any, evt: any, listener: any): Function {
     this.on(el, evt, listener);
     return () => { ListWrapper.remove(<any[]>(el._eventListenersMap[evt]), listener); };
   }
-  dispatchEvent(el: any /** TODO #9100 */, evt: any /** TODO #9100 */) {
-    if (isBlank(evt.target)) {
+  dispatchEvent(el: any, evt: any) {
+    if (!evt.target) {
       evt.target = el;
     }
-    if (isPresent(el._eventListenersMap)) {
-      var listeners: any = el._eventListenersMap[evt.type];
-      if (isPresent(listeners)) {
-        for (var i = 0; i < listeners.length; i++) {
+    if (el._eventListenersMap) {
+      const listeners: any = el._eventListenersMap[evt.type];
+      if (listeners) {
+        for (let i = 0; i < listeners.length; i++) {
           listeners[i](evt);
         }
       }
     }
-    if (isPresent(el.parent)) {
+    if (el.parent) {
       this.dispatchEvent(el.parent, evt);
     }
-    if (isPresent(el._window)) {
+    if (el._window) {
       this.dispatchEvent(el._window, evt);
     }
   }
-  createMouseEvent(eventType: any /** TODO #9100 */): Event { return this.createEvent(eventType); }
+  createMouseEvent(eventType: any): Event { return this.createEvent(eventType); }
   createEvent(eventType: string): Event {
-    var evt = <Event>{
+    let event = <Event>{
       type: eventType,
       defaultPrevented: false,
-      preventDefault: () => { (<any>evt).defaultPrevented = true; }
+      preventDefault: () => { (<any>event).defaultPrevented = true; }
     };
-    return evt;
+    return event;
   }
-  preventDefault(evt: any /** TODO #9100 */) { evt.returnValue = false; }
-  isPrevented(evt: any /** TODO #9100 */): boolean {
-    return isPresent(evt.returnValue) && !evt.returnValue;
+  preventDefault(event: any) { event.returnValue = false; }
+  isPrevented(event: any): boolean { return isPresent(event.returnValue) && !event.returnValue; }
+  getInnerHTML(el: any): string {
+    return parse5.serialize(this.templateAwareRoot(el), {treeAdapter});
   }
-  getInnerHTML(el: any /** TODO #9100 */): string {
-    return serializer.serialize(this.templateAwareRoot(el));
+  getTemplateContent(el: any): Node { return null; }
+  getOuterHTML(el: any): string {
+    const fragment = treeAdapter.createDocumentFragment();
+    this.appendChild(fragment, el);
+    return parse5.serialize(fragment, {treeAdapter});
   }
-  getTemplateContent(el: any /** TODO #9100 */): Node {
-    return null;  // no <template> support in parse5.
-  }
-  getOuterHTML(el: any /** TODO #9100 */): string {
-    serializer.html = '';
-    serializer._serializeElement(el);
-    return serializer.html;
-  }
-  nodeName(node: any /** TODO #9100 */): string { return node.tagName; }
-  nodeValue(node: any /** TODO #9100 */): string { return node.nodeValue; }
+  nodeName(node: any): string { return node.tagName; }
+  nodeValue(node: any): string { return node.nodeValue; }
   type(node: any): string { throw _notImplemented('type'); }
-  content(node: any /** TODO #9100 */): string { return node.childNodes[0]; }
-  firstChild(el: any /** TODO #9100 */): Node { return el.firstChild; }
-  nextSibling(el: any /** TODO #9100 */): Node { return el.nextSibling; }
-  parentElement(el: any /** TODO #9100 */): Node { return el.parent; }
-  childNodes(el: any /** TODO #9100 */): Node[] { return el.childNodes; }
-  childNodesAsList(el: any /** TODO #9100 */): any[] {
-    var childNodes = el.childNodes;
-    var res = new Array(childNodes.length);
-    for (var i = 0; i < childNodes.length; i++) {
+  content(node: any): string { return node.childNodes[0]; }
+  firstChild(el: any): Node { return el.firstChild; }
+  nextSibling(el: any): Node { return el.nextSibling; }
+  parentElement(el: any): Node { return el.parent; }
+  childNodes(el: any): Node[] { return el.childNodes; }
+  childNodesAsList(el: any): any[] {
+    const childNodes = el.childNodes;
+    const res = new Array(childNodes.length);
+    for (let i = 0; i < childNodes.length; i++) {
       res[i] = childNodes[i];
     }
     return res;
   }
-  clearNodes(el: any /** TODO #9100 */) {
+  clearNodes(el: any) {
     while (el.childNodes.length > 0) {
       this.remove(el.childNodes[0]);
     }
   }
-  appendChild(el: any /** TODO #9100 */, node: any /** TODO #9100 */) {
+  appendChild(el: any, node: any) {
     this.remove(node);
     treeAdapter.appendChild(this.templateAwareRoot(el), node);
   }
-  removeChild(el: any /** TODO #9100 */, node: any /** TODO #9100 */) {
-    if (ListWrapper.contains(el.childNodes, node)) {
+  removeChild(el: any, node: any) {
+    if (el.childNodes.indexOf(node) > -1) {
       this.remove(node);
     }
   }
-  remove(el: any /** TODO #9100 */): HTMLElement {
-    var parent = el.parent;
+  remove(el: any): HTMLElement {
+    const parent = el.parent;
     if (parent) {
-      var index = parent.childNodes.indexOf(el);
+      const index = parent.childNodes.indexOf(el);
       parent.childNodes.splice(index, 1);
     }
-    var prev = el.previousSibling;
-    var next = el.nextSibling;
+    const prev = el.previousSibling;
+    const next = el.nextSibling;
     if (prev) {
       prev.next = next;
     }
@@ -240,45 +222,48 @@ export class Parse5DomAdapter extends DomAdapter {
     el.parent = null;
     return el;
   }
-  insertBefore(el: any /** TODO #9100 */, node: any /** TODO #9100 */) {
+  insertBefore(el: any, node: any) {
     this.remove(node);
     treeAdapter.insertBefore(el.parent, node, el);
   }
-  insertAllBefore(el: any /** TODO #9100 */, nodes: any /** TODO #9100 */) {
-    nodes.forEach((n: any /** TODO #9100 */) => this.insertBefore(el, n));
-  }
-  insertAfter(el: any /** TODO #9100 */, node: any /** TODO #9100 */) {
+  insertAllBefore(el: any, nodes: any) { nodes.forEach((n: any) => this.insertBefore(el, n)); }
+  insertAfter(el: any, node: any) {
     if (el.nextSibling) {
       this.insertBefore(el.nextSibling, node);
     } else {
       this.appendChild(el.parent, node);
     }
   }
-  setInnerHTML(el: any /** TODO #9100 */, value: any /** TODO #9100 */) {
+  setInnerHTML(el: any, value: any) {
     this.clearNodes(el);
-    var content = parser.parseFragment(value);
-    for (var i = 0; i < content.childNodes.length; i++) {
+    const content = parse5.parseFragment(value, {treeAdapter});
+    for (let i = 0; i < content.childNodes.length; i++) {
       treeAdapter.appendChild(el, content.childNodes[i]);
     }
   }
-  getText(el: any /** TODO #9100 */, isRecursive?: boolean): string {
+  getText(el: any, isRecursive?: boolean): string {
     if (this.isTextNode(el)) {
       return el.data;
-    } else if (this.isCommentNode(el)) {
+    }
+
+    if (this.isCommentNode(el)) {
       // In the DOM, comments within an element return an empty string for textContent
       // However, comment node instances return the comment content for textContent getter
       return isRecursive ? '' : el.data;
-    } else if (isBlank(el.childNodes) || el.childNodes.length == 0) {
+    }
+
+    if (!el.childNodes || el.childNodes.length == 0) {
       return '';
-    } else {
-      var textContent = '';
-      for (var i = 0; i < el.childNodes.length; i++) {
-        textContent += this.getText(el.childNodes[i], true);
-      }
-      return textContent;
     }
+
+    let textContent = '';
+    for (let i = 0; i < el.childNodes.length; i++) {
+      textContent += this.getText(el.childNodes[i], true);
+    }
+    return textContent;
   }
-  setText(el: any /** TODO #9100 */, value: string) {
+
+  setText(el: any, value: string) {
     if (this.isTextNode(el) || this.isCommentNode(el)) {
       el.data = value;
     } else {
@@ -286,25 +271,25 @@ export class Parse5DomAdapter extends DomAdapter {
       if (value !== '') treeAdapter.insertText(el, value);
     }
   }
-  getValue(el: any /** TODO #9100 */): string { return el.value; }
-  setValue(el: any /** TODO #9100 */, value: string) { el.value = value; }
-  getChecked(el: any /** TODO #9100 */): boolean { return el.checked; }
-  setChecked(el: any /** TODO #9100 */, value: boolean) { el.checked = value; }
+  getValue(el: any): string { return el.value; }
+  setValue(el: any, value: string) { el.value = value; }
+  getChecked(el: any): boolean { return el.checked; }
+  setChecked(el: any, value: boolean) { el.checked = value; }
   createComment(text: string): Comment { return treeAdapter.createCommentNode(text); }
-  createTemplate(html: any /** TODO #9100 */): HTMLElement {
-    var template = treeAdapter.createElement('template', 'http://www.w3.org/1999/xhtml', []);
-    var content = parser.parseFragment(html);
-    treeAdapter.appendChild(template, content);
+  createTemplate(html: any): HTMLElement {
+    const template = treeAdapter.createElement('template', 'http://www.w3.org/1999/xhtml', []);
+    const content = parse5.parseFragment(html, {treeAdapter});
+    treeAdapter.setTemplateContent(template, content);
     return template;
   }
-  createElement(tagName: any /** TODO #9100 */): HTMLElement {
+  createElement(tagName: any): HTMLElement {
     return treeAdapter.createElement(tagName, 'http://www.w3.org/1999/xhtml', []);
   }
-  createElementNS(ns: any /** TODO #9100 */, tagName: any /** TODO #9100 */): HTMLElement {
+  createElementNS(ns: any, tagName: any): HTMLElement {
     return treeAdapter.createElement(tagName, ns, []);
   }
   createTextNode(text: string): Text {
-    var t = <any>this.createComment(text);
+    const t = <any>this.createComment(text);
     t.type = 'text';
     return t;
   }
@@ -313,23 +298,23 @@ export class Parse5DomAdapter extends DomAdapter {
         'script', 'http://www.w3.org/1999/xhtml', [{name: attrName, value: attrValue}]);
   }
   createStyleElement(css: string): HTMLStyleElement {
-    var style = this.createElement('style');
+    const style = this.createElement('style');
     this.setText(style, css);
     return <HTMLStyleElement>style;
   }
-  createShadowRoot(el: any /** TODO #9100 */): HTMLElement {
+  createShadowRoot(el: any): HTMLElement {
     el.shadowRoot = treeAdapter.createDocumentFragment();
     el.shadowRoot.parent = el;
     return el.shadowRoot;
   }
-  getShadowRoot(el: any /** TODO #9100 */): Element { return el.shadowRoot; }
-  getHost(el: any /** TODO #9100 */): string { return el.host; }
+  getShadowRoot(el: any): Element { return el.shadowRoot; }
+  getHost(el: any): string { return el.host; }
   getDistributedNodes(el: any): Node[] { throw _notImplemented('getDistributedNodes'); }
   clone(node: Node): Node {
-    var _recursive = (node: any /** TODO #9100 */) => {
-      var nodeClone = Object.create(Object.getPrototypeOf(node));
-      for (var prop in node) {
-        var desc = Object.getOwnPropertyDescriptor(node, prop);
+    const _recursive = (node: any) => {
+      const nodeClone = Object.create(Object.getPrototypeOf(node));
+      for (const prop in node) {
+        const desc = Object.getOwnPropertyDescriptor(node, prop);
         if (desc && 'value' in desc && typeof desc.value !== 'object') {
           nodeClone[prop] = node[prop];
         }
@@ -342,17 +327,17 @@ export class Parse5DomAdapter extends DomAdapter {
       mapProps.forEach(mapName => {
         if (isPresent(node[mapName])) {
           nodeClone[mapName] = {};
-          for (var prop in node[mapName]) {
+          for (const prop in node[mapName]) {
             nodeClone[mapName][prop] = node[mapName][prop];
           }
         }
       });
-      var cNodes = node.children;
+      const cNodes = node.children;
       if (cNodes) {
-        var cNodesClone = new Array(cNodes.length);
-        for (var i = 0; i < cNodes.length; i++) {
-          var childNode = cNodes[i];
-          var childNodeClone = _recursive(childNode);
+        const cNodesClone = new Array(cNodes.length);
+        for (let i = 0; i < cNodes.length; i++) {
+          const childNode = cNodes[i];
+          const childNodeClone = _recursive(childNode);
           cNodesClone[i] = childNodeClone;
           if (i > 0) {
             childNodeClone.prev = cNodesClone[i - 1];
@@ -366,109 +351,101 @@ export class Parse5DomAdapter extends DomAdapter {
     };
     return _recursive(node);
   }
-  getElementsByClassName(element: any /** TODO #9100 */, name: string): HTMLElement[] {
+  getElementsByClassName(element: any, name: string): HTMLElement[] {
     return this.querySelectorAll(element, '.' + name);
   }
   getElementsByTagName(element: any, name: string): HTMLElement[] {
     throw _notImplemented('getElementsByTagName');
   }
-  classList(element: any /** TODO #9100 */): string[] {
-    var classAttrValue: any /** TODO #9100 */ = null;
-    var attributes = element.attribs;
+  classList(element: any): string[] {
+    let classAttrValue: any = null;
+    const attributes = element.attribs;
     if (attributes && attributes.hasOwnProperty('class')) {
       classAttrValue = attributes['class'];
     }
     return classAttrValue ? classAttrValue.trim().split(/\s+/g) : [];
   }
-  addClass(element: any /** TODO #9100 */, className: string) {
-    var classList = this.classList(element);
-    var index = classList.indexOf(className);
+  addClass(element: any, className: string) {
+    const classList = this.classList(element);
+    let index = classList.indexOf(className);
     if (index == -1) {
       classList.push(className);
       element.attribs['class'] = element.className = classList.join(' ');
     }
   }
-  removeClass(element: any /** TODO #9100 */, className: string) {
-    var classList = this.classList(element);
-    var index = classList.indexOf(className);
+  removeClass(element: any, className: string) {
+    const classList = this.classList(element);
+    let index = classList.indexOf(className);
     if (index > -1) {
       classList.splice(index, 1);
       element.attribs['class'] = element.className = classList.join(' ');
     }
   }
-  hasClass(element: any /** TODO #9100 */, className: string): boolean {
+  hasClass(element: any, className: string): boolean {
     return ListWrapper.contains(this.classList(element), className);
   }
-  hasStyle(element: any /** TODO #9100 */, styleName: string, styleValue: string = null): boolean {
-    var value = this.getStyle(element, styleName) || '';
+  hasStyle(element: any, styleName: string, styleValue: string = null): boolean {
+    const value = this.getStyle(element, styleName) || '';
     return styleValue ? value == styleValue : value.length > 0;
   }
   /** @internal */
-  _readStyleAttribute(element: any /** TODO #9100 */) {
-    var styleMap = {};
-    var attributes = element.attribs;
+  _readStyleAttribute(element: any) {
+    const styleMap = {};
+    const attributes = element.attribs;
     if (attributes && attributes.hasOwnProperty('style')) {
-      var styleAttrValue = attributes['style'];
-      var styleList = styleAttrValue.split(/;+/g);
-      for (var i = 0; i < styleList.length; i++) {
+      const styleAttrValue = attributes['style'];
+      const styleList = styleAttrValue.split(/;+/g);
+      for (let i = 0; i < styleList.length; i++) {
         if (styleList[i].length > 0) {
-          var elems = styleList[i].split(/:+/g);
-          (styleMap as any /** TODO #9100 */)[elems[0].trim()] = elems[1].trim();
+          const elems = styleList[i].split(/:+/g);
+          (styleMap as any)[elems[0].trim()] = elems[1].trim();
         }
       }
     }
     return styleMap;
   }
   /** @internal */
-  _writeStyleAttribute(element: any /** TODO #9100 */, styleMap: any /** TODO #9100 */) {
-    var styleAttrValue = '';
-    for (var key in styleMap) {
-      var newValue = styleMap[key];
-      if (newValue && newValue.length > 0) {
+  _writeStyleAttribute(element: any, styleMap: any) {
+    let styleAttrValue = '';
+    for (const key in styleMap) {
+      const newValue = styleMap[key];
+      if (newValue) {
         styleAttrValue += key + ':' + styleMap[key] + ';';
       }
     }
     element.attribs['style'] = styleAttrValue;
   }
-  setStyle(element: any /** TODO #9100 */, styleName: string, styleValue: string) {
-    var styleMap = this._readStyleAttribute(element);
-    (styleMap as any /** TODO #9100 */)[styleName] = styleValue;
+  setStyle(element: any, styleName: string, styleValue: string) {
+    const styleMap = this._readStyleAttribute(element);
+    (styleMap as any)[styleName] = styleValue;
     this._writeStyleAttribute(element, styleMap);
   }
-  removeStyle(element: any /** TODO #9100 */, styleName: string) {
-    this.setStyle(element, styleName, null);
-  }
-  getStyle(element: any /** TODO #9100 */, styleName: string): string {
-    var styleMap = this._readStyleAttribute(element);
-    return styleMap.hasOwnProperty(styleName) ? (styleMap as any /** TODO #9100 */)[styleName] : '';
-  }
-  tagName(element: any /** TODO #9100 */): string {
-    return element.tagName == 'style' ? 'STYLE' : element.tagName;
-  }
-  attributeMap(element: any /** TODO #9100 */): Map<string, string> {
-    var res = new Map<string, string>();
-    var elAttrs = treeAdapter.getAttrList(element);
-    for (var i = 0; i < elAttrs.length; i++) {
-      var attrib = elAttrs[i];
+  removeStyle(element: any, styleName: string) { this.setStyle(element, styleName, null); }
+  getStyle(element: any, styleName: string): string {
+    const styleMap = this._readStyleAttribute(element);
+    return styleMap.hasOwnProperty(styleName) ? (styleMap as any)[styleName] : '';
+  }
+  tagName(element: any): string { return element.tagName == 'style' ? 'STYLE' : element.tagName; }
+  attributeMap(element: any): Map<string, string> {
+    const res = new Map<string, string>();
+    const elAttrs = treeAdapter.getAttrList(element);
+    for (let i = 0; i < elAttrs.length; i++) {
+      const attrib = elAttrs[i];
       res.set(attrib.name, attrib.value);
     }
     return res;
   }
-  hasAttribute(element: any /** TODO #9100 */, attribute: string): boolean {
+  hasAttribute(element: any, attribute: string): boolean {
     return element.attribs && element.attribs.hasOwnProperty(attribute);
   }
-  hasAttributeNS(element: any /** TODO #9100 */, ns: string, attribute: string): boolean {
-    throw 'not implemented';
-  }
-  getAttribute(element: any /** TODO #9100 */, attribute: string): string {
+  hasAttributeNS(element: any, ns: string, attribute: string): boolean { throw 'not implemented'; }
+  getAttribute(element: any, attribute: string): string {
     return element.attribs && element.attribs.hasOwnProperty(attribute) ?
         element.attribs[attribute] :
         null;
   }
-  getAttributeNS(element: any /** TODO #9100 */, ns: string, attribute: string): string {
-    throw 'not implemented';
-  }
-  setAttribute(element: any /** TODO #9100 */, attribute: string, value: string) {
+  getAttributeNS(element: any, ns: string, attribute: string): string { throw 'not implemented'; }
+  setAttribute(element: any, attribute: string, value: string) {
     if (attribute) {
       element.attribs[attribute] = value;
       if (attribute === 'class') {
@@ -476,25 +453,23 @@ export class Parse5DomAdapter extends DomAdapter {
       }
     }
   }
-  setAttributeNS(element: any /** TODO #9100 */, ns: string, attribute: string, value: string) {
+  setAttributeNS(element: any, ns: string, attribute: string, value: string) {
     throw 'not implemented';
   }
-  removeAttribute(element: any /** TODO #9100 */, attribute: string) {
+  removeAttribute(element: any, attribute: string) {
     if (attribute) {
       delete element.attribs[attribute];
     }
   }
-  removeAttributeNS(element: any /** TODO #9100 */, ns: string, name: string) {
-    throw 'not implemented';
-  }
-  templateAwareRoot(el: any /** TODO #9100 */): any {
-    return this.isTemplateElement(el) ? this.content(el) : el;
+  removeAttributeNS(element: any, ns: string, name: string) { throw 'not implemented'; }
+  templateAwareRoot(el: any): any {
+    return this.isTemplateElement(el) ? treeAdapter.getTemplateContent(el) : el;
   }
   createHtmlDocument(): Document {
-    var newDoc = treeAdapter.createDocument();
+    const newDoc = treeAdapter.createDocument();
     newDoc.title = 'fake title';
-    var head = treeAdapter.createElement('head', null, []);
-    var body = treeAdapter.createElement('body', 'http://www.w3.org/1999/xhtml', []);
+    const head = treeAdapter.createElement('head', null, []);
+    const body = treeAdapter.createElement('body', 'http://www.w3.org/1999/xhtml', []);
     this.appendChild(newDoc, head);
     this.appendChild(newDoc, body);
     newDoc['head'] = head;
@@ -502,31 +477,22 @@ export class Parse5DomAdapter extends DomAdapter {
     newDoc['_window'] = StringMapWrapper.create();
     return newDoc;
   }
-  defaultDoc(): Document {
-    if (defDoc === null) {
-      defDoc = this.createHtmlDocument();
-    }
-    return defDoc;
-  }
-  getBoundingClientRect(el: any /** TODO #9100 */): any {
-    return {left: 0, top: 0, width: 0, height: 0};
-  }
+  defaultDoc(): Document { return defDoc = defDoc || this.createHtmlDocument(); }
+  getBoundingClientRect(el: any): any { return {left: 0, top: 0, width: 0, height: 0}; }
   getTitle(): string { return this.defaultDoc().title || ''; }
   setTitle(newTitle: string) { this.defaultDoc().title = newTitle; }
   isTemplateElement(el: any): boolean {
     return this.isElementNode(el) && this.tagName(el) === 'template';
   }
-  isTextNode(node: any /** TODO #9100 */): boolean { return treeAdapter.isTextNode(node); }
-  isCommentNode(node: any /** TODO #9100 */): boolean { return treeAdapter.isCommentNode(node); }
-  isElementNode(node: any /** TODO #9100 */): boolean {
-    return node ? treeAdapter.isElementNode(node) : false;
-  }
-  hasShadowRoot(node: any /** TODO #9100 */): boolean { return isPresent(node.shadowRoot); }
-  isShadowRoot(node: any /** TODO #9100 */): boolean { return this.getShadowRoot(node) == node; }
-  importIntoDoc(node: any /** TODO #9100 */): any { return this.clone(node); }
-  adoptNode(node: any /** TODO #9100 */): any { return node; }
-  getHref(el: any /** TODO #9100 */): string { return el.href; }
-  resolveAndSetHref(el: any /** TODO #9100 */, baseUrl: string, href: string) {
+  isTextNode(node: any): boolean { return treeAdapter.isTextNode(node); }
+  isCommentNode(node: any): boolean { return treeAdapter.isCommentNode(node); }
+  isElementNode(node: any): boolean { return node ? treeAdapter.isElementNode(node) : false; }
+  hasShadowRoot(node: any): boolean { return isPresent(node.shadowRoot); }
+  isShadowRoot(node: any): boolean { return this.getShadowRoot(node) == node; }
+  importIntoDoc(node: any): any { return this.clone(node); }
+  adoptNode(node: any): any { return node; }
+  getHref(el: any): string { return el.href; }
+  resolveAndSetHref(el: any, baseUrl: string, href: string) {
     if (href == null) {
       el.href = baseUrl;
     } else {
@@ -534,11 +500,11 @@ export class Parse5DomAdapter extends DomAdapter {
     }
   }
   /** @internal */
-  _buildRules(parsedRules: any /** TODO #9100 */, css?: any /** TODO #9100 */) {
-    var rules: any[] /** TODO #9100 */ = [];
-    for (var i = 0; i < parsedRules.length; i++) {
-      var parsedRule = parsedRules[i];
-      var rule: {[key: string]: any} = {};
+  _buildRules(parsedRules: any, css?: any) {
+    const rules: any[] = [];
+    for (let i = 0; i < parsedRules.length; i++) {
+      const parsedRule = parsedRules[i];
+      const rule: {[key: string]: any} = {};
       rule['cssText'] = css;
       rule['style'] = {content: '', cssText: ''};
       if (parsedRule.type == 'rule') {
@@ -553,9 +519,8 @@ export class Parse5DomAdapter extends DomAdapter {
         if (isBlank(parsedRule.declarations)) {
           continue;
         }
-        for (var j = 0; j < parsedRule.declarations.length; j++) {
-          var declaration = parsedRule.declarations[j];
-
+        for (let j = 0; j < parsedRule.declarations.length; j++) {
+          const declaration = parsedRule.declarations[j];
           rule['style'] = declaration.property[declaration.value];
           rule['style'].cssText += declaration.property + ': ' + declaration.value + ';';
         }
@@ -586,28 +551,21 @@ export class Parse5DomAdapter extends DomAdapter {
   getHistory(): History { throw 'not implemented'; }
   getLocation(): Location { throw 'not implemented'; }
   getUserAgent(): string { return 'Fake user agent'; }
-  getData(el: any /** TODO #9100 */, name: string): string {
-    return this.getAttribute(el, 'data-' + name);
-  }
-  getComputedStyle(el: any /** TODO #9100 */): any { throw 'not implemented'; }
-  setData(el: any /** TODO #9100 */, name: string, value: string) {
-    this.setAttribute(el, 'data-' + name, value);
-  }
+  getData(el: any, name: string): string { return this.getAttribute(el, 'data-' + name); }
+  getComputedStyle(el: any): any { throw 'not implemented'; }
+  setData(el: any, name: string, value: string) { this.setAttribute(el, 'data-' + name, value); }
   // TODO(tbosch): move this into a separate environment class once we have it
   setGlobalVar(path: string, value: any) { setValueOnPath(global, path, value); }
   supportsWebAnimation(): boolean { return false; }
-  performanceNow(): number { return DateWrapper.toMillis(DateWrapper.now()); }
+  performanceNow(): number { return Date.now(); }
   getAnimationPrefix(): string { return ''; }
   getTransitionEnd(): string { return 'transitionend'; }
   supportsAnimation(): boolean { return true; }
 
-  replaceChild(
-      el: any /** TODO #9100 */, newNode: any /** TODO #9100 */, oldNode: any /** TODO #9100 */) {
-    throw new Error('not implemented');
-  }
+  replaceChild(el: any, newNode: any, oldNode: any) { throw new Error('not implemented'); }
   parse(templateHtml: string) { throw new Error('not implemented'); }
   invoke(el: Element, methodName: string, args: any[]): any { throw new Error('not implemented'); }
-  getEventKey(event: any /** TODO #9100 */): string { throw new Error('not implemented'); }
+  getEventKey(event: any): string { throw new Error('not implemented'); }
 
   supportsCookies(): boolean { return false; }
   getCookie(name: string): string { throw new Error('not implemented'); }
@@ -616,7 +574,7 @@ export class Parse5DomAdapter extends DomAdapter {
 }
 
 // TODO: build a proper list, this one is all the keys of a HTMLInputElement
-var _HTMLElementPropertyList = [
+const _HTMLElementPropertyList = [
   'webkitEntries',
   'incremental',
   'webkitdirectory',
@@ -798,5 +756,5 @@ var _HTMLElementPropertyList = [
   'nodeValue',
   'nodeName',
   'closure_lm_714617',
-  '__jsaction'
+  '__jsaction',
 ];
diff --git a/npm-shrinkwrap.clean.json b/npm-shrinkwrap.clean.json
index 49d01dec75de..c10934092a64 100644
--- a/npm-shrinkwrap.clean.json
+++ b/npm-shrinkwrap.clean.json
@@ -3527,7 +3527,7 @@
       "version": "2.2.0"
     },
     "parse5": {
-      "version": "1.3.2"
+      "version": "2.2.1"
     },
     "parsejson": {
       "version": "0.0.1"
@@ -4646,5 +4646,5 @@
     }
   },
   "name": "angular-srcs",
-  "version": "2.0.0"
+  "version": "2.1.0-beta.0"
 }
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 549e18a18542..3af1e3dd62ca 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-srcs",
-  "version": "2.0.0",
+  "version": "2.1.0-beta.0",
   "dependencies": {
     "@types/angularjs": {
       "version": "1.5.13-alpha",
@@ -5617,9 +5617,9 @@
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"
     },
     "parse5": {
-      "version": "1.3.2",
-      "from": "parse5@1.3.2",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-1.3.2.tgz"
+      "version": "2.2.1",
+      "from": "parse5@2.2.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-2.2.1.tgz"
     },
     "parsejson": {
       "version": "0.0.1",
diff --git a/package.json b/package.json
index 188dc609a8b8..4b0176dbbf08 100644
--- a/package.json
+++ b/package.json
@@ -68,7 +68,7 @@
     "minimist": "^1.2.0",
     "nan": "^2.4.0",
     "node-uuid": "1.4.x",
-    "parse5": "1.3.2",
+    "parse5": "^2.2.1",
     "protractor": "^4.0.5",
     "react": "^0.14.0",
     "rewire": "^2.3.3",
diff --git a/test-main.js b/test-main.js
index da89e1887183..11e11de04b1c 100644
--- a/test-main.js
+++ b/test-main.js
@@ -14,7 +14,7 @@ System.config({
     'benchpress/*': 'dist/js/dev/es5/benchpress/*.js',
     '@angular': 'dist/all/@angular',
     'rxjs': 'node_modules/rxjs',
-    'parse5/index': 'dist/all/empty.js',
+    'parse5': 'dist/all/empty.js',
     '@angular/platform-server/src/parse5_adapter': 'dist/all/empty.js',
     'angular2/*': 'dist/all/angular2/*.js',
     'angular2/src/alt_router/router_testing_providers': 'dist/all/angular2/src/alt_router/router_testing_providers.js'

From 5cb78566c234ad2910cf63ceb0aee3b0ec20fcd1 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Sun, 25 Sep 2016 10:35:08 -0700
Subject: [PATCH 45/70] docs(CssSelector): `[name*=value]` is not supported

fixes #6042
---
 modules/@angular/compiler/src/selector.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/@angular/compiler/src/selector.ts b/modules/@angular/compiler/src/selector.ts
index 5c68d49225ea..b216e65d5182 100644
--- a/modules/@angular/compiler/src/selector.ts
+++ b/modules/@angular/compiler/src/selector.ts
@@ -17,7 +17,7 @@ const _SELECTOR_REGEXP = new RegExp(
     '(\\:not\\()|' +                              //":not("
         '([-\\w]+)|' +                            // "tag"
         '(?:\\.([-\\w]+))|' +                     // ".class"
-        '(?:\\[([-\\w*]+)(?:=([^\\]]*))?\\])|' +  // "[name]", "[name=value]" or "[name*=value]"
+        '(?:\\[([-\\w*]+)(?:=([^\\]]*))?\\])|' +  // "[name]", "[name=value]"
         '(\\))|' +                                // ")"
         '(\\s*,\\s*)',                            // ","
     'g');

From 975aca95bb802c9dd3639f4cd0d82d94c5d54fc8 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Sun, 25 Sep 2016 11:28:47 -0700
Subject: [PATCH 46/70] refactor(CssSelector): misc cleanup

---
 modules/@angular/compiler/src/selector.ts | 234 ++++++++++------------
 1 file changed, 106 insertions(+), 128 deletions(-)

diff --git a/modules/@angular/compiler/src/selector.ts b/modules/@angular/compiler/src/selector.ts
index b216e65d5182..df3878627db5 100644
--- a/modules/@angular/compiler/src/selector.ts
+++ b/modules/@angular/compiler/src/selector.ts
@@ -6,13 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-
-import {ListWrapper} from './facade/collection';
-import {StringWrapper, isBlank, isPresent} from './facade/lang';
 import {getHtmlTagDefinition} from './ml_parser/html_tags';
 
-const _EMPTY_ATTR_VALUE = '';
-
 const _SELECTOR_REGEXP = new RegExp(
     '(\\:not\\()|' +                              //":not("
         '([-\\w]+)|' +                            // "tag"
@@ -34,21 +29,21 @@ export class CssSelector {
   notSelectors: CssSelector[] = [];
 
   static parse(selector: string): CssSelector[] {
-    var results: CssSelector[] = [];
-    var _addResult = (res: CssSelector[], cssSel: CssSelector) => {
-      if (cssSel.notSelectors.length > 0 && isBlank(cssSel.element) &&
-          ListWrapper.isEmpty(cssSel.classNames) && ListWrapper.isEmpty(cssSel.attrs)) {
+    const results: CssSelector[] = [];
+    const _addResult = (res: CssSelector[], cssSel: CssSelector) => {
+      if (cssSel.notSelectors.length > 0 && !cssSel.element && cssSel.classNames.length == 0 &&
+          cssSel.attrs.length == 0) {
         cssSel.element = '*';
       }
       res.push(cssSel);
     };
-    var cssSelector = new CssSelector();
-    var match: string[];
-    var current = cssSelector;
-    var inNot = false;
+    let cssSelector = new CssSelector();
+    let match: string[];
+    let current = cssSelector;
+    let inNot = false;
     _SELECTOR_REGEXP.lastIndex = 0;
-    while (isPresent(match = _SELECTOR_REGEXP.exec(selector))) {
-      if (isPresent(match[1])) {
+    while (match = _SELECTOR_REGEXP.exec(selector)) {
+      if (match[1]) {
         if (inNot) {
           throw new Error('Nesting :not is not allowed in a selector');
         }
@@ -56,20 +51,20 @@ export class CssSelector {
         current = new CssSelector();
         cssSelector.notSelectors.push(current);
       }
-      if (isPresent(match[2])) {
+      if (match[2]) {
         current.setElement(match[2]);
       }
-      if (isPresent(match[3])) {
+      if (match[3]) {
         current.addClassName(match[3]);
       }
-      if (isPresent(match[4])) {
+      if (match[4]) {
         current.addAttribute(match[4], match[5]);
       }
-      if (isPresent(match[6])) {
+      if (match[6]) {
         inNot = false;
         current = cssSelector;
       }
-      if (isPresent(match[7])) {
+      if (match[7]) {
         if (inNot) {
           throw new Error('Multiple selectors in :not are not supported');
         }
@@ -106,37 +101,22 @@ export class CssSelector {
                                                   `<${tagName}${classAttr}${attrs}></${tagName}>`;
   }
 
-  addAttribute(name: string, value: string = _EMPTY_ATTR_VALUE) {
-    this.attrs.push(name);
-    if (isPresent(value)) {
-      value = value.toLowerCase();
-    } else {
-      value = _EMPTY_ATTR_VALUE;
-    }
-    this.attrs.push(value);
+  addAttribute(name: string, value: string = '') {
+    this.attrs.push(name, value && value.toLowerCase() || '');
   }
 
   addClassName(name: string) { this.classNames.push(name.toLowerCase()); }
 
   toString(): string {
-    var res = '';
-    if (isPresent(this.element)) {
-      res += this.element;
+    let res: string = this.element || '';
+    if (this.classNames) {
+      this.classNames.forEach(klass => res += `.${klass}`);
     }
-    if (isPresent(this.classNames)) {
-      for (var i = 0; i < this.classNames.length; i++) {
-        res += '.' + this.classNames[i];
-      }
-    }
-    if (isPresent(this.attrs)) {
-      for (var i = 0; i < this.attrs.length;) {
-        var attrName = this.attrs[i++];
-        var attrValue = this.attrs[i++];
-        res += '[' + attrName;
-        if (attrValue.length > 0) {
-          res += '=' + attrValue;
-        }
-        res += ']';
+    if (this.attrs) {
+      for (let i = 0; i < this.attrs.length; i += 2) {
+        const name = this.attrs[i];
+        const value = this.attrs[i + 1];
+        res += `[${name}${value ? '=' + value : ''}]`;
       }
     }
     this.notSelectors.forEach(notSelector => res += `:not(${notSelector})`);
@@ -150,26 +130,26 @@ export class CssSelector {
  */
 export class SelectorMatcher {
   static createNotMatcher(notSelectors: CssSelector[]): SelectorMatcher {
-    var notMatcher = new SelectorMatcher();
+    const notMatcher = new SelectorMatcher();
     notMatcher.addSelectables(notSelectors, null);
     return notMatcher;
   }
 
-  private _elementMap = new Map<string, SelectorContext[]>();
-  private _elementPartialMap = new Map<string, SelectorMatcher>();
-  private _classMap = new Map<string, SelectorContext[]>();
-  private _classPartialMap = new Map<string, SelectorMatcher>();
-  private _attrValueMap = new Map<string, Map<string, SelectorContext[]>>();
-  private _attrValuePartialMap = new Map<string, Map<string, SelectorMatcher>>();
+  private _elementMap: {[k: string]: SelectorContext[]} = {};
+  private _elementPartialMap: {[k: string]: SelectorMatcher} = {};
+  private _classMap: {[k: string]: SelectorContext[]} = {};
+  private _classPartialMap: {[k: string]: SelectorMatcher} = {};
+  private _attrValueMap: {[k: string]: {[k: string]: SelectorContext[]}} = {};
+  private _attrValuePartialMap: {[k: string]: {[k: string]: SelectorMatcher}} = {};
   private _listContexts: SelectorListContext[] = [];
 
   addSelectables(cssSelectors: CssSelector[], callbackCtxt?: any) {
-    var listContext: SelectorListContext = null;
+    let listContext: SelectorListContext = null;
     if (cssSelectors.length > 1) {
       listContext = new SelectorListContext(cssSelectors);
       this._listContexts.push(listContext);
     }
-    for (var i = 0; i < cssSelectors.length; i++) {
+    for (let i = 0; i < cssSelectors.length; i++) {
       this._addSelectable(cssSelectors[i], callbackCtxt, listContext);
     }
   }
@@ -181,14 +161,14 @@ export class SelectorMatcher {
    */
   private _addSelectable(
       cssSelector: CssSelector, callbackCtxt: any, listContext: SelectorListContext) {
-    var matcher: SelectorMatcher = this;
-    var element = cssSelector.element;
-    var classNames = cssSelector.classNames;
-    var attrs = cssSelector.attrs;
-    var selectable = new SelectorContext(cssSelector, callbackCtxt, listContext);
-
-    if (isPresent(element)) {
-      var isTerminal = attrs.length === 0 && classNames.length === 0;
+    let matcher: SelectorMatcher = this;
+    const element = cssSelector.element;
+    const classNames = cssSelector.classNames;
+    const attrs = cssSelector.attrs;
+    const selectable = new SelectorContext(cssSelector, callbackCtxt, listContext);
+
+    if (element) {
+      const isTerminal = attrs.length === 0 && classNames.length === 0;
       if (isTerminal) {
         this._addTerminal(matcher._elementMap, element, selectable);
       } else {
@@ -196,10 +176,10 @@ export class SelectorMatcher {
       }
     }
 
-    if (isPresent(classNames)) {
-      for (var index = 0; index < classNames.length; index++) {
-        var isTerminal = attrs.length === 0 && index === classNames.length - 1;
-        var className = classNames[index];
+    if (classNames) {
+      for (let i = 0; i < classNames.length; i++) {
+        const isTerminal = attrs.length === 0 && i === classNames.length - 1;
+        const className = classNames[i];
         if (isTerminal) {
           this._addTerminal(matcher._classMap, className, selectable);
         } else {
@@ -208,47 +188,47 @@ export class SelectorMatcher {
       }
     }
 
-    if (isPresent(attrs)) {
-      for (var index = 0; index < attrs.length;) {
-        var isTerminal = index === attrs.length - 2;
-        var attrName = attrs[index++];
-        var attrValue = attrs[index++];
+    if (attrs) {
+      for (let i = 0; i < attrs.length; i += 2) {
+        const isTerminal = i === attrs.length - 2;
+        const name = attrs[i];
+        const value = attrs[i + 1];
         if (isTerminal) {
-          var terminalMap = matcher._attrValueMap;
-          var terminalValuesMap = terminalMap.get(attrName);
+          const terminalMap = matcher._attrValueMap;
+          let terminalValuesMap = terminalMap[name];
           if (!terminalValuesMap) {
-            terminalValuesMap = new Map<string, SelectorContext[]>();
-            terminalMap.set(attrName, terminalValuesMap);
+            terminalValuesMap = {};
+            terminalMap[name] = terminalValuesMap;
           }
-          this._addTerminal(terminalValuesMap, attrValue, selectable);
+          this._addTerminal(terminalValuesMap, value, selectable);
         } else {
-          var parttialMap = matcher._attrValuePartialMap;
-          var partialValuesMap = parttialMap.get(attrName);
+          let partialMap = matcher._attrValuePartialMap;
+          let partialValuesMap = partialMap[name];
           if (!partialValuesMap) {
-            partialValuesMap = new Map<string, SelectorMatcher>();
-            parttialMap.set(attrName, partialValuesMap);
+            partialValuesMap = {};
+            partialMap[name] = partialValuesMap;
           }
-          matcher = this._addPartial(partialValuesMap, attrValue);
+          matcher = this._addPartial(partialValuesMap, value);
         }
       }
     }
   }
 
   private _addTerminal(
-      map: Map<string, SelectorContext[]>, name: string, selectable: SelectorContext) {
-    var terminalList = map.get(name);
+      map: {[k: string]: SelectorContext[]}, name: string, selectable: SelectorContext) {
+    let terminalList = map[name];
     if (!terminalList) {
       terminalList = [];
-      map.set(name, terminalList);
+      map[name] = terminalList;
     }
     terminalList.push(selectable);
   }
 
-  private _addPartial(map: Map<string, SelectorMatcher>, name: string): SelectorMatcher {
-    var matcher = map.get(name);
+  private _addPartial(map: {[k: string]: SelectorMatcher}, name: string): SelectorMatcher {
+    let matcher = map[name];
     if (!matcher) {
       matcher = new SelectorMatcher();
-      map.set(name, matcher);
+      map[name] = matcher;
     }
     return matcher;
   }
@@ -261,12 +241,12 @@ export class SelectorMatcher {
    * @return boolean true if a match was found
   */
   match(cssSelector: CssSelector, matchedCallback: (c: CssSelector, a: any) => void): boolean {
-    var result = false;
-    var element = cssSelector.element;
-    var classNames = cssSelector.classNames;
-    var attrs = cssSelector.attrs;
+    let result = false;
+    const element = cssSelector.element;
+    const classNames = cssSelector.classNames;
+    const attrs = cssSelector.attrs;
 
-    for (var i = 0; i < this._listContexts.length; i++) {
+    for (let i = 0; i < this._listContexts.length; i++) {
       this._listContexts[i].alreadyMatched = false;
     }
 
@@ -274,9 +254,9 @@ export class SelectorMatcher {
     result = this._matchPartial(this._elementPartialMap, element, cssSelector, matchedCallback) ||
         result;
 
-    if (isPresent(classNames)) {
-      for (var index = 0; index < classNames.length; index++) {
-        var className = classNames[index];
+    if (classNames) {
+      for (let i = 0; i < classNames.length; i++) {
+        const className = classNames[i];
         result =
             this._matchTerminal(this._classMap, className, cssSelector, matchedCallback) || result;
         result =
@@ -285,28 +265,25 @@ export class SelectorMatcher {
       }
     }
 
-    if (isPresent(attrs)) {
-      for (var index = 0; index < attrs.length;) {
-        var attrName = attrs[index++];
-        var attrValue = attrs[index++];
+    if (attrs) {
+      for (let i = 0; i < attrs.length; i += 2) {
+        const name = attrs[i];
+        const value = attrs[i + 1];
 
-        var terminalValuesMap = this._attrValueMap.get(attrName);
-        if (!StringWrapper.equals(attrValue, _EMPTY_ATTR_VALUE)) {
-          result = this._matchTerminal(
-                       terminalValuesMap, _EMPTY_ATTR_VALUE, cssSelector, matchedCallback) ||
-              result;
+        const terminalValuesMap = this._attrValueMap[name];
+        if (value) {
+          result =
+              this._matchTerminal(terminalValuesMap, '', cssSelector, matchedCallback) || result;
         }
-        result = this._matchTerminal(terminalValuesMap, attrValue, cssSelector, matchedCallback) ||
-            result;
+        result =
+            this._matchTerminal(terminalValuesMap, value, cssSelector, matchedCallback) || result;
 
-        var partialValuesMap = this._attrValuePartialMap.get(attrName);
-        if (!StringWrapper.equals(attrValue, _EMPTY_ATTR_VALUE)) {
-          result = this._matchPartial(
-                       partialValuesMap, _EMPTY_ATTR_VALUE, cssSelector, matchedCallback) ||
-              result;
+        const partialValuesMap = this._attrValuePartialMap[name];
+        if (value) {
+          result = this._matchPartial(partialValuesMap, '', cssSelector, matchedCallback) || result;
         }
         result =
-            this._matchPartial(partialValuesMap, attrValue, cssSelector, matchedCallback) || result;
+            this._matchPartial(partialValuesMap, value, cssSelector, matchedCallback) || result;
       }
     }
     return result;
@@ -314,24 +291,24 @@ export class SelectorMatcher {
 
   /** @internal */
   _matchTerminal(
-      map: Map<string, SelectorContext[]>, name: string, cssSelector: CssSelector,
+      map: {[k: string]: SelectorContext[]}, name: string, cssSelector: CssSelector,
       matchedCallback: (c: CssSelector, a: any) => void): boolean {
-    if (!map || isBlank(name)) {
+    if (!map || typeof name !== 'string') {
       return false;
     }
 
-    var selectables = map.get(name);
-    var starSelectables = map.get('*');
-    if (isPresent(starSelectables)) {
+    let selectables = map[name];
+    const starSelectables = map['*'];
+    if (starSelectables) {
       selectables = selectables.concat(starSelectables);
     }
     if (!selectables) {
       return false;
     }
-    var selectable: SelectorContext;
-    var result = false;
-    for (var index = 0; index < selectables.length; index++) {
-      selectable = selectables[index];
+    let selectable: SelectorContext;
+    let result = false;
+    for (let i = 0; i < selectables.length; i++) {
+      selectable = selectables[i];
       result = selectable.finalize(cssSelector, matchedCallback) || result;
     }
     return result;
@@ -339,12 +316,13 @@ export class SelectorMatcher {
 
   /** @internal */
   _matchPartial(
-      map: Map<string, SelectorMatcher>, name: string, cssSelector: CssSelector,
+      map: {[k: string]: SelectorMatcher}, name: string, cssSelector: CssSelector,
       matchedCallback: (c: CssSelector, a: any) => void): boolean {
-    if (!map || isBlank(name)) {
+    if (!map || typeof name !== 'string') {
       return false;
     }
-    var nestedSelector = map.get(name);
+
+    const nestedSelector = map[name];
     if (!nestedSelector) {
       return false;
     }
@@ -373,13 +351,13 @@ export class SelectorContext {
   }
 
   finalize(cssSelector: CssSelector, callback: (c: CssSelector, a: any) => void): boolean {
-    var result = true;
+    let result = true;
     if (this.notSelectors.length > 0 && (!this.listContext || !this.listContext.alreadyMatched)) {
-      var notMatcher = SelectorMatcher.createNotMatcher(this.notSelectors);
+      const notMatcher = SelectorMatcher.createNotMatcher(this.notSelectors);
       result = !notMatcher.match(cssSelector, null);
     }
-    if (result && isPresent(callback) && (!this.listContext || !this.listContext.alreadyMatched)) {
-      if (isPresent(this.listContext)) {
+    if (result && callback && (!this.listContext || !this.listContext.alreadyMatched)) {
+      if (this.listContext) {
         this.listContext.alreadyMatched = true;
       }
       callback(this.selector, this.cbContext);

From ea6defcf11c930fcdfeeec9ef7f3b840ed11deb7 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Tue, 27 Sep 2016 17:30:26 -0700
Subject: [PATCH 47/70] refactor(BrowserAdapter): cleanup

---
 .../src/browser/browser_adapter.ts            | 306 +++++++-----------
 .../src/browser/generic_browser_adapter.ts    |  26 +-
 .../platform-browser/src/dom/dom_adapter.ts   |   2 +-
 3 files changed, 136 insertions(+), 198 deletions(-)

diff --git a/modules/@angular/platform-browser/src/browser/browser_adapter.ts b/modules/@angular/platform-browser/src/browser/browser_adapter.ts
index b0963ea18ba7..87f16893a98c 100644
--- a/modules/@angular/platform-browser/src/browser/browser_adapter.ts
+++ b/modules/@angular/platform-browser/src/browser/browser_adapter.ts
@@ -7,21 +7,21 @@
  */
 
 import {setRootDomAdapter} from '../dom/dom_adapter';
-import {DateWrapper, global, isBlank, isFunction, isPresent, setValueOnPath} from '../facade/lang';
+import {global, isBlank, isPresent, setValueOnPath} from '../facade/lang';
 
 import {GenericBrowserDomAdapter} from './generic_browser_adapter';
 
-var _attrToPropMap = {
+const _attrToPropMap = {
   'class': 'className',
   'innerHtml': 'innerHTML',
   'readonly': 'readOnly',
-  'tabindex': 'tabIndex'
+  'tabindex': 'tabIndex',
 };
 
 const DOM_KEY_LOCATION_NUMPAD = 3;
 
 // Map to convert some key or keyIdentifier values to what will be returned by getEventKey
-var _keyMap = {
+const _keyMap: {[k: string]: string} = {
   // The following values are here for cross-browser compatibility and to match the W3C standard
   // cf http://www.w3.org/TR/DOM-Level-3-Events-key/
   '\b': 'Backspace',
@@ -42,7 +42,7 @@ var _keyMap = {
 // There is a bug in Chrome for numeric keypad keys:
 // https://code.google.com/p/chromium/issues/detail?id=155654
 // 1, 2, 3 ... are reported as A, B, C ...
-var _chromeNumKeyPadMap = {
+const _chromeNumKeyPadMap = {
   'A': '1',
   'B': '2',
   'C': '3',
@@ -71,67 +71,45 @@ var _chromeNumKeyPadMap = {
 export class BrowserDomAdapter extends GenericBrowserDomAdapter {
   parse(templateHtml: string) { throw new Error('parse not implemented'); }
   static makeCurrent() { setRootDomAdapter(new BrowserDomAdapter()); }
-  hasProperty(element: any /** TODO #9100 */, name: string): boolean { return name in element; }
-  setProperty(el: /*element*/ any, name: string, value: any) { el[name] = value; }
-  getProperty(el: /*element*/ any, name: string): any { return el[name]; }
-  invoke(el: /*element*/ any, methodName: string, args: any[]): any {
-    el[methodName].apply(el, args);
-  }
+  hasProperty(element: Node, name: string): boolean { return name in element; }
+  setProperty(el: Node, name: string, value: any) { (<any>el)[name] = value; }
+  getProperty(el: Node, name: string): any { return (<any>el)[name]; }
+  invoke(el: Node, methodName: string, args: any[]): any { (<any>el)[methodName](...args); }
 
   // TODO(tbosch): move this into a separate environment class once we have it
-  logError(error: any /** TODO #9100 */) {
-    if (window.console.error) {
-      window.console.error(error);
-    } else {
-      window.console.log(error);
-    }
-  }
+  logError(error: string) { (window.console.error || window.console.log)(error); }
 
-  log(error: any /** TODO #9100 */) { window.console.log(error); }
+  log(error: string) { window.console.log(error); }
 
-  logGroup(error: any /** TODO #9100 */) {
-    if (window.console.group) {
-      window.console.group(error);
-      this.logError(error);
-    } else {
-      window.console.log(error);
-    }
+  logGroup(error: string) {
+    window.console.group && window.console.group(error);
+    this.logError(error);
   }
 
-  logGroupEnd() {
-    if (window.console.groupEnd) {
-      window.console.groupEnd();
-    }
-  }
+  logGroupEnd() { window.console.groupEnd && window.console.groupEnd(); }
 
   get attrToPropMap(): any { return _attrToPropMap; }
 
   query(selector: string): any { return document.querySelector(selector); }
-  querySelector(el: any /** TODO #9100 */, selector: string): HTMLElement {
-    return el.querySelector(selector);
+  querySelector(el: Element, selector: string): HTMLElement {
+    return el.querySelector(selector) as HTMLElement;
   }
-  querySelectorAll(el: any /** TODO #9100 */, selector: string): any[] {
-    return el.querySelectorAll(selector);
-  }
-  on(el: any /** TODO #9100 */, evt: any /** TODO #9100 */, listener: any /** TODO #9100 */) {
-    el.addEventListener(evt, listener, false);
-  }
-  onAndCancel(
-      el: any /** TODO #9100 */, evt: any /** TODO #9100 */,
-      listener: any /** TODO #9100 */): Function {
+  querySelectorAll(el: any, selector: string): any[] { return el.querySelectorAll(selector); }
+  on(el: Node, evt: any, listener: any) { el.addEventListener(evt, listener, false); }
+  onAndCancel(el: Node, evt: any, listener: any): Function {
     el.addEventListener(evt, listener, false);
     // Needed to follow Dart's subscription semantic, until fix of
     // https://code.google.com/p/dart/issues/detail?id=17406
     return () => { el.removeEventListener(evt, listener, false); };
   }
-  dispatchEvent(el: any /** TODO #9100 */, evt: any /** TODO #9100 */) { el.dispatchEvent(evt); }
+  dispatchEvent(el: Node, evt: any) { el.dispatchEvent(evt); }
   createMouseEvent(eventType: string): MouseEvent {
-    var evt: MouseEvent = document.createEvent('MouseEvent');
+    const evt: MouseEvent = document.createEvent('MouseEvent');
     evt.initEvent(eventType, true, true);
     return evt;
   }
-  createEvent(eventType: any /** TODO #9100 */): Event {
-    var evt: Event = document.createEvent('Event');
+  createEvent(eventType: any): Event {
+    const evt: Event = document.createEvent('Event');
     evt.initEvent(eventType, true, true);
     return evt;
   }
@@ -142,11 +120,11 @@ export class BrowserDomAdapter extends GenericBrowserDomAdapter {
   isPrevented(evt: Event): boolean {
     return evt.defaultPrevented || isPresent(evt.returnValue) && !evt.returnValue;
   }
-  getInnerHTML(el: any /** TODO #9100 */): string { return el.innerHTML; }
-  getTemplateContent(el: any /** TODO #9100 */): Node {
+  getInnerHTML(el: HTMLElement): string { return el.innerHTML; }
+  getTemplateContent(el: Node): Node {
     return 'content' in el && el instanceof HTMLTemplateElement ? el.content : null;
   }
-  getOuterHTML(el: any /** TODO #9100 */): string { return el.outerHTML; }
+  getOuterHTML(el: HTMLElement): string { return el.outerHTML; }
   nodeName(node: Node): string { return node.nodeName; }
   nodeValue(node: Node): string { return node.nodeValue; }
   type(node: HTMLInputElement): string { return node.type; }
@@ -157,72 +135,62 @@ export class BrowserDomAdapter extends GenericBrowserDomAdapter {
       return node;
     }
   }
-  firstChild(el: any /** TODO #9100 */): Node { return el.firstChild; }
-  nextSibling(el: any /** TODO #9100 */): Node { return el.nextSibling; }
-  parentElement(el: any /** TODO #9100 */): Node { return el.parentNode; }
-  childNodes(el: any /** TODO #9100 */): Node[] { return el.childNodes; }
-  childNodesAsList(el: any /** TODO #9100 */): any[] {
-    var childNodes = el.childNodes;
-    var res = new Array(childNodes.length);
-    for (var i = 0; i < childNodes.length; i++) {
+  firstChild(el: Node): Node { return el.firstChild; }
+  nextSibling(el: Node): Node { return el.nextSibling; }
+  parentElement(el: Node): Node { return el.parentNode; }
+  childNodes(el: any): Node[] { return el.childNodes; }
+  childNodesAsList(el: Node): any[] {
+    const childNodes = el.childNodes;
+    const res = new Array(childNodes.length);
+    for (let i = 0; i < childNodes.length; i++) {
       res[i] = childNodes[i];
     }
     return res;
   }
-  clearNodes(el: any /** TODO #9100 */) {
+  clearNodes(el: Node) {
     while (el.firstChild) {
       el.removeChild(el.firstChild);
     }
   }
-  appendChild(el: any /** TODO #9100 */, node: any /** TODO #9100 */) { el.appendChild(node); }
-  removeChild(el: any /** TODO #9100 */, node: any /** TODO #9100 */) { el.removeChild(node); }
-  replaceChild(el: Node, newChild: any /** TODO #9100 */, oldChild: any /** TODO #9100 */) {
-    el.replaceChild(newChild, oldChild);
-  }
-  remove(node: any /** TODO #9100 */): Node {
+  appendChild(el: Node, node: Node) { el.appendChild(node); }
+  removeChild(el: Node, node: Node) { el.removeChild(node); }
+  replaceChild(el: Node, newChild: Node, oldChild: Node) { el.replaceChild(newChild, oldChild); }
+  remove(node: Node): Node {
     if (node.parentNode) {
       node.parentNode.removeChild(node);
     }
     return node;
   }
-  insertBefore(el: any /** TODO #9100 */, node: any /** TODO #9100 */) {
-    el.parentNode.insertBefore(node, el);
-  }
-  insertAllBefore(el: any /** TODO #9100 */, nodes: any /** TODO #9100 */) {
-    nodes.forEach((n: any /** TODO #9100 */) => el.parentNode.insertBefore(n, el));
-  }
-  insertAfter(el: any /** TODO #9100 */, node: any /** TODO #9100 */) {
-    el.parentNode.insertBefore(node, el.nextSibling);
-  }
-  setInnerHTML(el: any /** TODO #9100 */, value: any /** TODO #9100 */) { el.innerHTML = value; }
-  getText(el: any /** TODO #9100 */): string { return el.textContent; }
-  // TODO(vicb): removed Element type because it does not support StyleElement
-  setText(el: any /** TODO #9100 */, value: string) { el.textContent = value; }
-  getValue(el: any /** TODO #9100 */): string { return el.value; }
-  setValue(el: any /** TODO #9100 */, value: string) { el.value = value; }
-  getChecked(el: any /** TODO #9100 */): boolean { return el.checked; }
-  setChecked(el: any /** TODO #9100 */, value: boolean) { el.checked = value; }
+  insertBefore(el: Node, node: Node) { el.parentNode.insertBefore(node, el); }
+  insertAllBefore(el: Node, nodes: Node[]) {
+    nodes.forEach((n: any) => el.parentNode.insertBefore(n, el));
+  }
+  insertAfter(el: Node, node: any) { el.parentNode.insertBefore(node, el.nextSibling); }
+  setInnerHTML(el: Element, value: string) { el.innerHTML = value; }
+  getText(el: Node): string { return el.textContent; }
+  setText(el: Node, value: string) { el.textContent = value; }
+  getValue(el: any): string { return el.value; }
+  setValue(el: any, value: string) { el.value = value; }
+  getChecked(el: any): boolean { return el.checked; }
+  setChecked(el: any, value: boolean) { el.checked = value; }
   createComment(text: string): Comment { return document.createComment(text); }
-  createTemplate(html: any /** TODO #9100 */): HTMLElement {
-    var t = document.createElement('template');
+  createTemplate(html: any): HTMLElement {
+    const t = document.createElement('template');
     t.innerHTML = html;
     return t;
   }
-  createElement(tagName: any /* TODO #9100 */, doc = document): HTMLElement {
-    return doc.createElement(tagName);
-  }
-  createElementNS(ns: any /* TODO #9100 */, tagName: any /* TODO #9100 */, doc = document):
-      Element {
+  createElement(tagName: string, doc = document): HTMLElement { return doc.createElement(tagName); }
+  createElementNS(ns: string, tagName: string, doc = document): Element {
     return doc.createElementNS(ns, tagName);
   }
   createTextNode(text: string, doc = document): Text { return doc.createTextNode(text); }
   createScriptTag(attrName: string, attrValue: string, doc = document): HTMLScriptElement {
-    var el = <HTMLScriptElement>doc.createElement('SCRIPT');
+    const el = <HTMLScriptElement>doc.createElement('SCRIPT');
     el.setAttribute(attrName, attrValue);
     return el;
   }
   createStyleElement(css: string, doc = document): HTMLStyleElement {
-    var style = <HTMLStyleElement>doc.createElement('style');
+    const style = <HTMLStyleElement>doc.createElement('style');
     this.appendChild(style, this.createTextNode(css));
     return style;
   }
@@ -230,77 +198,63 @@ export class BrowserDomAdapter extends GenericBrowserDomAdapter {
   getShadowRoot(el: HTMLElement): DocumentFragment { return (<any>el).shadowRoot; }
   getHost(el: HTMLElement): HTMLElement { return (<any>el).host; }
   clone(node: Node): Node { return node.cloneNode(true); }
-  getElementsByClassName(element: any /** TODO #9100 */, name: string): HTMLElement[] {
+  getElementsByClassName(element: any, name: string): HTMLElement[] {
     return element.getElementsByClassName(name);
   }
-  getElementsByTagName(element: any /** TODO #9100 */, name: string): HTMLElement[] {
+  getElementsByTagName(element: any, name: string): HTMLElement[] {
     return element.getElementsByTagName(name);
   }
-  classList(element: any /** TODO #9100 */): any[] {
-    return <any[]>Array.prototype.slice.call(element.classList, 0);
-  }
-  addClass(element: any /** TODO #9100 */, className: string) { element.classList.add(className); }
-  removeClass(element: any /** TODO #9100 */, className: string) {
-    element.classList.remove(className);
-  }
-  hasClass(element: any /** TODO #9100 */, className: string): boolean {
+  classList(element: any): any[] { return Array.prototype.slice.call(element.classList, 0); }
+  addClass(element: any, className: string) { element.classList.add(className); }
+  removeClass(element: any, className: string) { element.classList.remove(className); }
+  hasClass(element: any, className: string): boolean {
     return element.classList.contains(className);
   }
-  setStyle(element: any /** TODO #9100 */, styleName: string, styleValue: string) {
+  setStyle(element: any, styleName: string, styleValue: string) {
     element.style[styleName] = styleValue;
   }
-  removeStyle(element: any /** TODO #9100 */, stylename: string) {
-    element.style[stylename] = null;
-  }
-  getStyle(element: any /** TODO #9100 */, stylename: string): string {
-    return element.style[stylename];
-  }
-  hasStyle(element: any /** TODO #9100 */, styleName: string, styleValue: string = null): boolean {
-    var value = this.getStyle(element, styleName) || '';
+  removeStyle(element: any, stylename: string) { element.style[stylename] = null; }
+  getStyle(element: any, stylename: string): string { return element.style[stylename]; }
+  hasStyle(element: any, styleName: string, styleValue: string = null): boolean {
+    const value = this.getStyle(element, styleName) || '';
     return styleValue ? value == styleValue : value.length > 0;
   }
-  tagName(element: any /** TODO #9100 */): string { return element.tagName; }
-  attributeMap(element: any /** TODO #9100 */): Map<string, string> {
-    var res = new Map<string, string>();
-    var elAttrs = element.attributes;
-    for (var i = 0; i < elAttrs.length; i++) {
-      var attrib = elAttrs[i];
+  tagName(element: any): string { return element.tagName; }
+  attributeMap(element: any): Map<string, string> {
+    const res = new Map<string, string>();
+    const elAttrs = element.attributes;
+    for (let i = 0; i < elAttrs.length; i++) {
+      const attrib = elAttrs[i];
       res.set(attrib.name, attrib.value);
     }
     return res;
   }
-  hasAttribute(element: any /** TODO #9100 */, attribute: string): boolean {
+  hasAttribute(element: Element, attribute: string): boolean {
     return element.hasAttribute(attribute);
   }
-  hasAttributeNS(element: any /** TODO #9100 */, ns: string, attribute: string): boolean {
+  hasAttributeNS(element: Element, ns: string, attribute: string): boolean {
     return element.hasAttributeNS(ns, attribute);
   }
-  getAttribute(element: any /** TODO #9100 */, attribute: string): string {
+  getAttribute(element: Element, attribute: string): string {
     return element.getAttribute(attribute);
   }
-  getAttributeNS(element: any /** TODO #9100 */, ns: string, name: string): string {
+  getAttributeNS(element: Element, ns: string, name: string): string {
     return element.getAttributeNS(ns, name);
   }
-  setAttribute(element: any /** TODO #9100 */, name: string, value: string) {
-    element.setAttribute(name, value);
-  }
-  setAttributeNS(element: any /** TODO #9100 */, ns: string, name: string, value: string) {
+  setAttribute(element: Element, name: string, value: string) { element.setAttribute(name, value); }
+  setAttributeNS(element: Element, ns: string, name: string, value: string) {
     element.setAttributeNS(ns, name, value);
   }
-  removeAttribute(element: any /** TODO #9100 */, attribute: string) {
-    element.removeAttribute(attribute);
-  }
-  removeAttributeNS(element: any /** TODO #9100 */, ns: string, name: string) {
+  removeAttribute(element: Element, attribute: string) { element.removeAttribute(attribute); }
+  removeAttributeNS(element: Element, ns: string, name: string) {
     element.removeAttributeNS(ns, name);
   }
-  templateAwareRoot(el: any /** TODO #9100 */): any {
-    return this.isTemplateElement(el) ? this.content(el) : el;
-  }
+  templateAwareRoot(el: Node): any { return this.isTemplateElement(el) ? this.content(el) : el; }
   createHtmlDocument(): HTMLDocument {
     return document.implementation.createHTMLDocument('fakeTitle');
   }
   defaultDoc(): HTMLDocument { return document; }
-  getBoundingClientRect(el: any /** TODO #9100 */): any {
+  getBoundingClientRect(el: Element): any {
     try {
       return el.getBoundingClientRect();
     } catch (e) {
@@ -309,45 +263,34 @@ export class BrowserDomAdapter extends GenericBrowserDomAdapter {
   }
   getTitle(): string { return document.title; }
   setTitle(newTitle: string) { document.title = newTitle || ''; }
-  elementMatches(n: any /** TODO #9100 */, selector: string): boolean {
-    var matches = false;
+  elementMatches(n: any, selector: string): boolean {
     if (n instanceof HTMLElement) {
-      if (n.matches) {
-        matches = n.matches(selector);
-      } else if (n.msMatchesSelector) {
-        matches = n.msMatchesSelector(selector);
-      } else if (n.webkitMatchesSelector) {
-        matches = n.webkitMatchesSelector(selector);
-      }
+      return n.matches && n.matches(selector) ||
+          n.msMatchesSelector && n.msMatchesSelector(selector) ||
+          n.webkitMatchesSelector && n.webkitMatchesSelector(selector);
     }
-    return matches;
+
+    return false;
   }
-  isTemplateElement(el: any): boolean {
+  isTemplateElement(el: Node): boolean {
     return el instanceof HTMLElement && el.nodeName == 'TEMPLATE';
   }
   isTextNode(node: Node): boolean { return node.nodeType === Node.TEXT_NODE; }
   isCommentNode(node: Node): boolean { return node.nodeType === Node.COMMENT_NODE; }
   isElementNode(node: Node): boolean { return node.nodeType === Node.ELEMENT_NODE; }
-  hasShadowRoot(node: any /** TODO #9100 */): boolean {
+  hasShadowRoot(node: any): boolean {
     return isPresent(node.shadowRoot) && node instanceof HTMLElement;
   }
-  isShadowRoot(node: any /** TODO #9100 */): boolean { return node instanceof DocumentFragment; }
-  importIntoDoc(node: Node): any {
-    var toImport = node;
-    if (this.isTemplateElement(node)) {
-      toImport = this.content(node);
-    }
-    return document.importNode(toImport, true);
-  }
+  isShadowRoot(node: any): boolean { return node instanceof DocumentFragment; }
+  importIntoDoc(node: Node): any { return document.importNode(this.templateAwareRoot(node), true); }
   adoptNode(node: Node): any { return document.adoptNode(node); }
   getHref(el: Element): string { return (<any>el).href; }
-  getEventKey(event: any /** TODO #9100 */): string {
-    var key = event.key;
+  getEventKey(event: any): string {
+    let key = event.key;
     if (isBlank(key)) {
       key = event.keyIdentifier;
       // keyIdentifier is defined in the old draft of DOM Level 3 Events implemented by Chrome and
-      // Safari
-      // cf
+      // Safari cf
       // http://www.w3.org/TR/2007/WD-DOM-Level-3-Events-20071221/events.html#Events-KeyboardEvents-Interfaces
       if (isBlank(key)) {
         return 'Unidentified';
@@ -358,53 +301,49 @@ export class BrowserDomAdapter extends GenericBrowserDomAdapter {
           // There is a bug in Chrome for numeric keypad keys:
           // https://code.google.com/p/chromium/issues/detail?id=155654
           // 1, 2, 3 ... are reported as A, B, C ...
-          key = (_chromeNumKeyPadMap as any /** TODO #9100 */)[key];
+          key = (_chromeNumKeyPadMap as any)[key];
         }
       }
     }
-    if (_keyMap.hasOwnProperty(key)) {
-      key = (_keyMap as any /** TODO #9100 */)[key];
-    }
-    return key;
+
+    return _keyMap[key] || key;
   }
   getGlobalEventTarget(target: string): EventTarget {
-    if (target == 'window') {
+    if (target === 'window') {
       return window;
-    } else if (target == 'document') {
+    }
+    if (target === 'document') {
       return document;
-    } else if (target == 'body') {
+    }
+    if (target === 'body') {
       return document.body;
     }
   }
   getHistory(): History { return window.history; }
   getLocation(): Location { return window.location; }
   getBaseHref(): string {
-    var href = getBaseElementHref();
-    if (isBlank(href)) {
-      return null;
-    }
-    return relativePath(href);
+    const href = getBaseElementHref();
+    return isBlank(href) ? null : relativePath(href);
   }
   resetBaseElement(): void { baseElement = null; }
   getUserAgent(): string { return window.navigator.userAgent; }
-  setData(element: any /** TODO #9100 */, name: string, value: string) {
+  setData(element: Element, name: string, value: string) {
     this.setAttribute(element, 'data-' + name, value);
   }
-  getData(element: any /** TODO #9100 */, name: string): string {
+  getData(element: Element, name: string): string {
     return this.getAttribute(element, 'data-' + name);
   }
-  getComputedStyle(element: any /** TODO #9100 */): any { return getComputedStyle(element); }
+  getComputedStyle(element: any): any { return getComputedStyle(element); }
   // TODO(tbosch): move this into a separate environment class once we have it
   setGlobalVar(path: string, value: any) { setValueOnPath(global, path, value); }
-  supportsWebAnimation(): boolean { return isFunction((<any>Element).prototype['animate']); }
+  supportsWebAnimation(): boolean {
+    return typeof(<any>Element).prototype['animate'] === 'function';
+  }
   performanceNow(): number {
     // performance.now() is not available in all browsers, see
     // http://caniuse.com/#search=performance.now
-    if (isPresent(window.performance) && isPresent(window.performance.now)) {
-      return window.performance.now();
-    } else {
-      return DateWrapper.toMillis(DateWrapper.now());
-    }
+    return window.performance && window.performance.now ? window.performance.now() :
+                                                          new Date().getTime();
   }
 
   supportsCookies(): boolean { return true; }
@@ -418,12 +357,11 @@ export class BrowserDomAdapter extends GenericBrowserDomAdapter {
   }
 }
 
-
-var baseElement: any /** TODO #9100 */ = null;
+let baseElement: HTMLElement = null;
 function getBaseElementHref(): string {
-  if (isBlank(baseElement)) {
+  if (!baseElement) {
     baseElement = document.querySelector('base');
-    if (isBlank(baseElement)) {
+    if (!baseElement) {
       return null;
     }
   }
@@ -431,9 +369,9 @@ function getBaseElementHref(): string {
 }
 
 // based on urlUtils.js in AngularJS 1
-var urlParsingNode: any /** TODO #9100 */ = null;
-function relativePath(url: any /** TODO #9100 */): string {
-  if (isBlank(urlParsingNode)) {
+let urlParsingNode: any;
+function relativePath(url: any): string {
+  if (!urlParsingNode) {
     urlParsingNode = document.createElement('a');
   }
   urlParsingNode.setAttribute('href', url);
diff --git a/modules/@angular/platform-browser/src/browser/generic_browser_adapter.ts b/modules/@angular/platform-browser/src/browser/generic_browser_adapter.ts
index b0480e651c7f..60b42308515a 100644
--- a/modules/@angular/platform-browser/src/browser/generic_browser_adapter.ts
+++ b/modules/@angular/platform-browser/src/browser/generic_browser_adapter.ts
@@ -7,8 +7,7 @@
  */
 
 import {DomAdapter} from '../dom/dom_adapter';
-import {StringMapWrapper} from '../facade/collection';
-import {isFunction, isPresent} from '../facade/lang';
+import {isPresent} from '../facade/lang';
 
 
 
@@ -24,27 +23,30 @@ export abstract class GenericBrowserDomAdapter extends DomAdapter {
   constructor() {
     super();
     try {
-      var element = this.createElement('div', this.defaultDoc());
+      const element = this.createElement('div', this.defaultDoc());
       if (isPresent(this.getStyle(element, 'animationName'))) {
         this._animationPrefix = '';
       } else {
-        var domPrefixes = ['Webkit', 'Moz', 'O', 'ms'];
-        for (var i = 0; i < domPrefixes.length; i++) {
+        const domPrefixes = ['Webkit', 'Moz', 'O', 'ms'];
+
+        for (let i = 0; i < domPrefixes.length; i++) {
           if (isPresent(this.getStyle(element, domPrefixes[i] + 'AnimationName'))) {
             this._animationPrefix = '-' + domPrefixes[i].toLowerCase() + '-';
             break;
           }
         }
       }
-      var transEndEventNames: {[key: string]: string} = {
+
+      const transEndEventNames: {[key: string]: string} = {
         WebkitTransition: 'webkitTransitionEnd',
         MozTransition: 'transitionend',
         OTransition: 'oTransitionEnd otransitionend',
         transition: 'transitionend'
       };
-      StringMapWrapper.forEach(transEndEventNames, (value: string, key: string) => {
+
+      Object.keys(transEndEventNames).forEach((key: string) => {
         if (isPresent(this.getStyle(element, key))) {
-          this._transitionEnd = value;
+          this._transitionEnd = transEndEventNames[key];
         }
       });
     } catch (e) {
@@ -59,12 +61,10 @@ export abstract class GenericBrowserDomAdapter extends DomAdapter {
   }
   supportsDOMEvents(): boolean { return true; }
   supportsNativeShadowDOM(): boolean {
-    return isFunction((<any>this.defaultDoc().body).createShadowRoot);
-  }
-  getAnimationPrefix(): string {
-    return isPresent(this._animationPrefix) ? this._animationPrefix : '';
+    return typeof(<any>this.defaultDoc().body).createShadowRoot === 'function';
   }
-  getTransitionEnd(): string { return isPresent(this._transitionEnd) ? this._transitionEnd : ''; }
+  getAnimationPrefix(): string { return this._animationPrefix ? this._animationPrefix : ''; }
+  getTransitionEnd(): string { return this._transitionEnd ? this._transitionEnd : ''; }
   supportsAnimation(): boolean {
     return isPresent(this._animationPrefix) && isPresent(this._transitionEnd);
   }
diff --git a/modules/@angular/platform-browser/src/dom/dom_adapter.ts b/modules/@angular/platform-browser/src/dom/dom_adapter.ts
index ac16c914a5d0..9682584b283f 100644
--- a/modules/@angular/platform-browser/src/dom/dom_adapter.ts
+++ b/modules/@angular/platform-browser/src/dom/dom_adapter.ts
@@ -8,7 +8,7 @@
 
 import {Type} from '@angular/core';
 
-var _DOM: DomAdapter = null;
+let _DOM: DomAdapter = null;
 
 export function getDOM() {
   return _DOM;

From 2c3825f2c81f1181560ac1c18d3300f1a7e471a2 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Tue, 27 Sep 2016 17:57:26 -0700
Subject: [PATCH 48/70] fix(BrowserAdapter): correctly removes styles on IE

fixes #7916
---
 modules/@angular/common/src/directives/ng_style.ts          | 2 +-
 .../platform-browser/src/browser/browser_adapter.ts         | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/@angular/common/src/directives/ng_style.ts b/modules/@angular/common/src/directives/ng_style.ts
index a91f19051e7c..26a57948086f 100644
--- a/modules/@angular/common/src/directives/ng_style.ts
+++ b/modules/@angular/common/src/directives/ng_style.ts
@@ -67,7 +67,7 @@ export class NgStyle implements DoCheck {
 
   private _setStyle(nameAndUnit: string, value: string): void {
     const [name, unit] = nameAndUnit.split('.');
-    value = value !== null && value !== void(0) && unit ? `${value}${unit}` : value;
+    value = value && unit ? `${value}${unit}` : value;
 
     this._renderer.setElementStyle(this._ngEl.nativeElement, name, value);
   }
diff --git a/modules/@angular/platform-browser/src/browser/browser_adapter.ts b/modules/@angular/platform-browser/src/browser/browser_adapter.ts
index 87f16893a98c..57f924b6825e 100644
--- a/modules/@angular/platform-browser/src/browser/browser_adapter.ts
+++ b/modules/@angular/platform-browser/src/browser/browser_adapter.ts
@@ -213,7 +213,11 @@ export class BrowserDomAdapter extends GenericBrowserDomAdapter {
   setStyle(element: any, styleName: string, styleValue: string) {
     element.style[styleName] = styleValue;
   }
-  removeStyle(element: any, stylename: string) { element.style[stylename] = null; }
+  removeStyle(element: any, stylename: string) {
+    // IE requires '' instead of null
+    // see https://github.com/angular/angular/issues/7916
+    element.style[stylename] = '';
+  }
   getStyle(element: any, stylename: string): string { return element.style[stylename]; }
   hasStyle(element: any, styleName: string, styleValue: string = null): boolean {
     const value = this.getStyle(element, styleName) || '';

From aca117ac56039c2d5209500fe3879f124b07ac56 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Fri, 30 Sep 2016 11:42:46 -0700
Subject: [PATCH 49/70] fix(ShadowCss): fix `:host(tag)` and
 `:host-context(tag)`

fixes #11972
---
 modules/@angular/compiler/src/shadow_css.ts   | 17 ++++++++------
 .../@angular/compiler/test/shadow_css_spec.ts | 23 ++++++++++++++-----
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/modules/@angular/compiler/src/shadow_css.ts b/modules/@angular/compiler/src/shadow_css.ts
index 98d31c4b9ff2..e15f58b105e6 100644
--- a/modules/@angular/compiler/src/shadow_css.ts
+++ b/modules/@angular/compiler/src/shadow_css.ts
@@ -253,7 +253,7 @@ export class ShadowCss {
    *
    * to
    *
-   * scopeName.foo > .bar
+   * .foo<scopeName> > .bar
   */
   private _convertColonHost(cssText: string): string {
     return this._convertColonRule(cssText, _cssColonHostRe, this._colonHostPartReplacer);
@@ -264,7 +264,7 @@ export class ShadowCss {
    *
    * to
    *
-   * scopeName.foo > .bar, .foo scopeName > .bar { }
+   * .foo<scopeName> > .bar, .foo scopeName > .bar { }
    *
    * and
    *
@@ -272,7 +272,7 @@ export class ShadowCss {
    *
    * to
    *
-   * scopeName.foo .bar { ... }
+   * .foo<scopeName> .bar { ... }
   */
   private _convertColonHostContext(cssText: string): string {
     return this._convertColonRule(
@@ -280,7 +280,7 @@ export class ShadowCss {
   }
 
   private _convertColonRule(cssText: string, regExp: RegExp, partReplacer: Function): string {
-    // p1 = :host, p2 = contents of (), p3 rest of rule
+    // m[1] = :host, m[2] = contents of (), m[3] rest of rule
     return cssText.replace(regExp, function(...m: string[]) {
       if (m[2]) {
         const parts = m[2].split(',');
@@ -376,13 +376,14 @@ export class ShadowCss {
       string {
     // In Android browser, the lastIndex is not reset when the regex is used in String.replace()
     _polyfillHostRe.lastIndex = 0;
+
     if (_polyfillHostRe.test(selector)) {
       const replaceBy = this.strictStyling ? `[${hostSelector}]` : scopeSelector;
-      return selector.replace(_polyfillHostNoCombinator, replaceBy)
+      return selector.replace(_polyfillHostNoCombinatorRe, (hnc, selector) => selector + replaceBy)
           .replace(_polyfillHostRe, replaceBy + ' ');
-    } else {
-      return scopeSelector + ' ' + selector;
     }
+
+    return scopeSelector + ' ' + selector;
   }
 
   // return a selector with [name] suffix on each simple selector
@@ -447,6 +448,7 @@ export class ShadowCss {
         inAttributeSelector = false;
       }
     }
+
     return scoped + _scopeSelectorPart(selector.substring(startIndex));
   }
 
@@ -469,6 +471,7 @@ const _parenSuffix = ')(?:\\((' +
 const _cssColonHostRe = new RegExp('(' + _polyfillHost + _parenSuffix, 'gim');
 const _cssColonHostContextRe = new RegExp('(' + _polyfillHostContext + _parenSuffix, 'gim');
 const _polyfillHostNoCombinator = _polyfillHost + '-no-combinator';
+const _polyfillHostNoCombinatorRe = /-shadowcsshost-no-combinator([^\s]*)/;
 const _shadowDOMSelectorsRe = [
   /::shadow/g,
   /::content/g,
diff --git a/modules/@angular/compiler/test/shadow_css_spec.ts b/modules/@angular/compiler/test/shadow_css_spec.ts
index c974412dc94a..3750f8b0046e 100644
--- a/modules/@angular/compiler/test/shadow_css_spec.ts
+++ b/modules/@angular/compiler/test/shadow_css_spec.ts
@@ -99,16 +99,27 @@ export function main() {
     it('should handle :host', () => {
       expect(s(':host {}', 'a', 'a-host')).toEqual('[a-host] {}');
 
-      expect(s(':host(.x,.y) {}', 'a', 'a-host')).toEqual('[a-host].x, [a-host].y {}');
+      expect(s(':host(.x) {}', 'a', 'a-host')).toEqual('.x[a-host] {}');
+      expect(s(':host(ul) {}', 'a', 'a-host')).toEqual('ul[a-host] {}');
+
+      expect(s(':host(.x,.y) {}', 'a', 'a-host')).toEqual('.x[a-host], .y[a-host] {}');
+      expect(s(':host(ul,li) {}', 'a', 'a-host')).toEqual('ul[a-host], li[a-host] {}');
 
       expect(s(':host(.x,.y) > .z {}', 'a', 'a-host'))
-          .toEqual('[a-host].x > .z[a], [a-host].y > .z[a] {}');
+          .toEqual('.x[a-host] > .z[a], .y[a-host] > .z[a] {}');
+      expect(s(':host(ul,li) > .z {}', 'a', 'a-host'))
+          .toEqual('ul[a-host] > .z[a], li[a-host] > .z[a] {}');
     });
 
     it('should handle :host-context', () => {
-      expect(s(':host-context(.x) {}', 'a', 'a-host')).toEqual('[a-host].x, .x [a-host] {}');
+      expect(s(':host-context(.x) {}', 'a', 'a-host')).toEqual('.x[a-host], .x [a-host] {}');
+      expect(s(':host-context(div) {}', 'a', 'a-host')).toEqual('div[a-host], div [a-host] {}');
+
       expect(s(':host-context(.x) > .y {}', 'a', 'a-host'))
-          .toEqual('[a-host].x > .y[a], .x [a-host] > .y[a] {}');
+          .toEqual('.x[a-host] > .y[a], .x [a-host] > .y[a] {}');
+      expect(s(':host-context(ul) > .y {}', 'a', 'a-host'))
+          .toEqual('ul[a-host] > .y[a], ul [a-host] > .y[a] {}');
+
     });
 
     it('should support polyfill-next-selector', () => {
@@ -138,10 +149,10 @@ export function main() {
 
     it('should support polyfill-rule', () => {
       let css = s('polyfill-rule {content: \':host.foo .bar\';color: blue;}', 'a', 'a-host');
-      expect(css).toEqual('[a-host].foo .bar[a] {;color:blue;}');
+      expect(css).toEqual('.foo[a-host] .bar[a] {;color:blue;}');
 
       css = s('polyfill-rule {content: ":host.foo .bar";color:blue;}', 'a', 'a-host');
-      expect(css).toEqual('[a-host].foo .bar[a] {;color:blue;}');
+      expect(css).toEqual('.foo[a-host] .bar[a] {;color:blue;}');
     });
 
     it('should handle ::shadow', () => {

From d985cc0253c9d0be7389041432b1e0dfeef7bd13 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Fri, 30 Sep 2016 13:06:14 -0700
Subject: [PATCH 50/70] refactor(ShadowCss): add missing types

---
 modules/@angular/compiler/src/shadow_css.ts       |  2 +-
 modules/@angular/compiler/test/shadow_css_spec.ts | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/@angular/compiler/src/shadow_css.ts b/modules/@angular/compiler/src/shadow_css.ts
index e15f58b105e6..0abf47876a74 100644
--- a/modules/@angular/compiler/src/shadow_css.ts
+++ b/modules/@angular/compiler/src/shadow_css.ts
@@ -509,7 +509,7 @@ export class CssRule {
   constructor(public selector: string, public content: string) {}
 }
 
-export function processRules(input: string, ruleCallback: Function): string {
+export function processRules(input: string, ruleCallback: (rule: CssRule) => CssRule): string {
   const inputWithEscapedBlocks = escapeBlocks(input);
   let nextBlockIndex = 0;
   return inputWithEscapedBlocks.escapedString.replace(_ruleRe, function(...m: string[]) {
diff --git a/modules/@angular/compiler/test/shadow_css_spec.ts b/modules/@angular/compiler/test/shadow_css_spec.ts
index 3750f8b0046e..63b1e8845a76 100644
--- a/modules/@angular/compiler/test/shadow_css_spec.ts
+++ b/modules/@angular/compiler/test/shadow_css_spec.ts
@@ -207,8 +207,8 @@ export function main() {
   describe('processRules', () => {
     describe('parse rules', () => {
       function captureRules(input: string): CssRule[] {
-        const result: any[] /** TODO #9100 */ = [];
-        processRules(input, (cssRule: any /** TODO #9100 */) => {
+        const result: CssRule[] = [];
+        processRules(input, (cssRule) => {
           result.push(cssRule);
           return cssRule;
         });
@@ -239,15 +239,15 @@ export function main() {
     describe('modify rules', () => {
       it('should allow to change the selector while preserving whitespaces', () => {
         expect(processRules(
-                   '@import a; b {c {d}} e {f}', (cssRule: any /** TODO #9100 */) => new CssRule(
-                                                     cssRule.selector + '2', cssRule.content)))
+                   '@import a; b {c {d}} e {f}',
+                   (cssRule: CssRule) => new CssRule(cssRule.selector + '2', cssRule.content)))
             .toEqual('@import a2; b2 {c {d}} e2 {f}');
       });
 
       it('should allow to change the content', () => {
         expect(processRules(
-                   'a {b}', (cssRule: any /** TODO #9100 */) =>
-                                new CssRule(cssRule.selector, cssRule.content + '2')))
+                   'a {b}',
+                   (cssRule: CssRule) => new CssRule(cssRule.selector, cssRule.content + '2')))
             .toEqual('a {b2}');
       });
     });

From 73954000667800744f532b3aff91cbcec1fd6435 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Fri, 30 Sep 2016 13:20:48 -0700
Subject: [PATCH 51/70] fix(ShadowCss): support quoted attribute values

fixes #6085
---
 modules/@angular/compiler/src/shadow_css.ts       | 12 ++++++------
 modules/@angular/compiler/test/shadow_css_spec.ts |  9 +++++++++
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/modules/@angular/compiler/src/shadow_css.ts b/modules/@angular/compiler/src/shadow_css.ts
index 0abf47876a74..55ce7651c245 100644
--- a/modules/@angular/compiler/src/shadow_css.ts
+++ b/modules/@angular/compiler/src/shadow_css.ts
@@ -174,7 +174,7 @@ export class ShadowCss {
   private _insertPolyfillDirectivesInCssText(cssText: string): string {
     // Difference with webcomponents.js: does not handle comments
     return cssText.replace(
-        _cssContentNextSelectorRe, function(...m: string[]) { return m[1] + '{'; });
+        _cssContentNextSelectorRe, function(...m: string[]) { return m[2] + '{'; });
   }
 
   /*
@@ -196,7 +196,7 @@ export class ShadowCss {
     // Difference with webcomponents.js: does not handle comments
     return cssText.replace(_cssContentRuleRe, (...m: string[]) => {
       const rule = m[0].replace(m[1], '').replace(m[2], '');
-      return m[3] + rule;
+      return m[4] + rule;
     });
   }
 
@@ -242,7 +242,7 @@ export class ShadowCss {
     let m: RegExpExecArray;
     _cssContentUnscopedRuleRe.lastIndex = 0;
     while ((m = _cssContentUnscopedRuleRe.exec(cssText)) !== null) {
-      const rule = m[0].replace(m[2], '').replace(m[1], m[3]);
+      const rule = m[0].replace(m[2], '').replace(m[1], m[4]);
       r += rule + '\n\n';
     }
     return r;
@@ -458,10 +458,10 @@ export class ShadowCss {
   }
 }
 const _cssContentNextSelectorRe =
-    /polyfill-next-selector[^}]*content:[\s]*?['"](.*?)['"][;\s]*}([^{]*?){/gim;
-const _cssContentRuleRe = /(polyfill-rule)[^}]*(content:[\s]*['"](.*?)['"])[;\s]*[^}]*}/gim;
+    /polyfill-next-selector[^}]*content:[\s]*?(['"])(.*?)\1[;\s]*}([^{]*?){/gim;
+const _cssContentRuleRe = /(polyfill-rule)[^}]*(content:[\s]*(['"])(.*?)\3)[;\s]*[^}]*}/gim;
 const _cssContentUnscopedRuleRe =
-    /(polyfill-unscoped-rule)[^}]*(content:[\s]*['"](.*?)['"])[;\s]*[^}]*}/gim;
+    /(polyfill-unscoped-rule)[^}]*(content:[\s]*(['"])(.*?)\3)[;\s]*[^}]*}/gim;
 const _polyfillHost = '-shadowcsshost';
 // note: :host-context pre-processed to -shadowcsshostcontext.
 const _polyfillHostContext = '-shadowcsscontext';
diff --git a/modules/@angular/compiler/test/shadow_css_spec.ts b/modules/@angular/compiler/test/shadow_css_spec.ts
index 63b1e8845a76..cc8f1de454db 100644
--- a/modules/@angular/compiler/test/shadow_css_spec.ts
+++ b/modules/@angular/compiler/test/shadow_css_spec.ts
@@ -128,6 +128,9 @@ export function main() {
 
       css = s('polyfill-next-selector {content: "x > y"} z {}', 'a');
       expect(css).toEqual('x[a] > y[a]{}');
+
+      css = s(`polyfill-next-selector {content: 'button[priority="1"]'} z {}`, 'a');
+      expect(css).toEqual('button[priority="1"][a] {}');
     });
 
     it('should support polyfill-unscoped-rule', () => {
@@ -136,6 +139,9 @@ export function main() {
 
       css = s('polyfill-unscoped-rule {content: "#menu > .bar";color: blue;}', 'a');
       expect(css).toContain('#menu > .bar {;color:blue;}');
+
+      css = s(`polyfill-unscoped-rule {content: 'button[priority="1"]'}`, 'a');
+      expect(css).toContain('button[priority="1"] {}');
     });
 
     it('should support multiple instances polyfill-unscoped-rule', () => {
@@ -153,6 +159,9 @@ export function main() {
 
       css = s('polyfill-rule {content: ":host.foo .bar";color:blue;}', 'a', 'a-host');
       expect(css).toEqual('.foo[a-host] .bar[a] {;color:blue;}');
+
+      css = s(`polyfill-rule {content: 'button[priority="1"]'}`, 'a', 'a-host');
+      expect(css).toEqual('button[priority="1"][a] {}');
     });
 
     it('should handle ::shadow', () => {

From c99ef4938fda4ae2bf4eaf4642a228ec8519125e Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Fri, 30 Sep 2016 16:26:24 -0700
Subject: [PATCH 52/70] fix(ShadowCss): support `@page` and `@document` CSS
 rules (#11878)

fixes #11860
---
 modules/@angular/compiler/src/shadow_css.ts       |  6 ++++--
 modules/@angular/compiler/test/shadow_css_spec.ts | 12 ++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/modules/@angular/compiler/src/shadow_css.ts b/modules/@angular/compiler/src/shadow_css.ts
index 55ce7651c245..71d0c33bc780 100644
--- a/modules/@angular/compiler/src/shadow_css.ts
+++ b/modules/@angular/compiler/src/shadow_css.ts
@@ -323,10 +323,12 @@ export class ShadowCss {
     return processRules(cssText, (rule: CssRule) => {
       let selector = rule.selector;
       let content = rule.content;
-      if (rule.selector[0] != '@' || rule.selector.startsWith('@page')) {
+      if (rule.selector[0] != '@') {
         selector =
             this._scopeSelector(rule.selector, scopeSelector, hostSelector, this.strictStyling);
-      } else if (rule.selector.startsWith('@media') || rule.selector.startsWith('@supports')) {
+      } else if (
+          rule.selector.startsWith('@media') || rule.selector.startsWith('@supports') ||
+          rule.selector.startsWith('@page') || rule.selector.startsWith('@document')) {
         content = this._scopeSelectors(rule.content, scopeSelector, hostSelector);
       }
       return new CssRule(selector, content);
diff --git a/modules/@angular/compiler/test/shadow_css_spec.ts b/modules/@angular/compiler/test/shadow_css_spec.ts
index cc8f1de454db..30a4455d1442 100644
--- a/modules/@angular/compiler/test/shadow_css_spec.ts
+++ b/modules/@angular/compiler/test/shadow_css_spec.ts
@@ -52,6 +52,18 @@ export function main() {
       expect(s(css, 'a')).toEqual(expected);
     });
 
+    it('should handle page rules', () => {
+      const css = '@page {div {font-size:50px;}}';
+      const expected = '@page {div[a] {font-size:50px;}}';
+      expect(s(css, 'a')).toEqual(expected);
+    });
+
+    it('should handle document rules', () => {
+      const css = '@document url(http://www.w3.org/) {div {font-size:50px;}}';
+      const expected = '@document url(http://www.w3.org/) {div[a] {font-size:50px;}}';
+      expect(s(css, 'a')).toEqual(expected);
+    });
+
     it('should handle media rules with simple rules', () => {
       const css = '@media screen and (max-width: 800px) {div {font-size: 50px;}} div {}';
       const expected = '@media screen and (max-width:800px) {div[a] {font-size:50px;}} div[a] {}';

From eb85a7709a89d30679a2337ef6321bc0166424ee Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Fri, 30 Sep 2016 16:40:56 -0700
Subject: [PATCH 53/70] docs(gh): try to improve the issue template (#11891)

---
 .github/ISSUE_TEMPLATE.md | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 86c4d6d90b4a..c7b68e623491 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,3 +1,7 @@
+<!--
+IF YOU DON'T FILL OUT THE FOLLOWING INFORMATION WE MIGHT CLOSE YOUR ISSUE WITHOUT INVESTIGATING
+-->
+
 **I'm submitting a ...**  (check one with "x")
 ```
 [ ] bug report => search github for a similar issue or PR before submitting
@@ -5,14 +9,18 @@
 [ ] support request => Please do not submit support request here, instead see https://github.com/angular/angular/blob/master/CONTRIBUTING.md#question
 ```
 
-**Current behavior** 
+**Current behavior**
 <!-- Describe how the bug manifests. -->
 
 **Expected behavior**
 <!-- Describe what the behavior would be without the bug. -->
 
-**Reproduction of the problem**
-<!-- If the current behavior is a bug or you can illustrate your feature request better with an example, please provide the steps to reproduce and if possible a minimal demo of the problem via https://plnkr.co or similar (you can use this template as a starting point: http://plnkr.co/edit/tpl:AvJOMERrnz94ekVua0u5). -->
+**Minimal reproduction of the problem with instructions**
+<!--
+If the current behavior is a bug or you can illustrate your feature request better with an example, 
+please provide the *STEPS TO REPRODUCE* and if possible a *MINIMAL DEMO* of the problem via
+https://plnkr.co or similar (you can use this template as a starting point: http://plnkr.co/edit/tpl:AvJOMERrnz94ekVua0u5).
+-->
 
 **What is the motivation / use case for changing the behavior?**
 <!-- Describe the motivation or the concrete use case -->
@@ -20,12 +28,12 @@
 **Please tell us about your environment:**
 <!-- Operating system, IDE, package manager, HTTP server, ... -->
 
-* **Angular version:** 2.0.X 
+* **Angular version:** 2.0.X
 <!-- Check whether this is still an issue in the most recent Angular version -->
 
-* **Browser:** [all | Chrome XX | Firefox XX | IE XX | Safari XX | Mobile Chrome XX | Android X.X Web Browser | iOS XX Safari | iOS XX UIWebView | iOS XX WKWebView ] 
+* **Browser:** [all | Chrome XX | Firefox XX | IE XX | Safari XX | Mobile Chrome XX | Android X.X Web Browser | iOS XX Safari | iOS XX UIWebView | iOS XX WKWebView ]
 <!-- All browsers where this could be reproduced -->
  
 * **Language:** [all | TypeScript X.X | ES6/7 | ES5]
- 
+
 * **Node (for AoT issues):** `node --version` =   

From de56e31cf01b933870a3496e0fdfdd12e408d15e Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Fri, 30 Sep 2016 14:52:12 -0700
Subject: [PATCH 54/70] style(I18N): Carriage returns in serialized files

---
 .../compiler/src/i18n/serializers/xliff.ts    | 24 +++---
 .../compiler/src/i18n/serializers/xmb.ts      | 11 +--
 .../src/i18n/serializers/xml_helper.ts        |  4 +
 .../test/i18n/serializers/xliff_spec.ts       | 78 ++++++++++---------
 .../test/i18n/serializers/xmb_spec.ts         | 11 ++-
 5 files changed, 68 insertions(+), 60 deletions(-)

diff --git a/modules/@angular/compiler/src/i18n/serializers/xliff.ts b/modules/@angular/compiler/src/i18n/serializers/xliff.ts
index c1fc9540bcb1..08b0c84fa8f9 100644
--- a/modules/@angular/compiler/src/i18n/serializers/xliff.ts
+++ b/modules/@angular/compiler/src/i18n/serializers/xliff.ts
@@ -27,7 +27,6 @@ const _PLACEHOLDER_TAG = 'x';
 const _SOURCE_TAG = 'source';
 const _TARGET_TAG = 'target';
 const _UNIT_TAG = 'trans-unit';
-const _CR = (ws: number = 0) => new xml.Text(`\n${new Array(ws).join(' ')}`);
 
 // http://docs.oasis-open.org/xliff/v1.2/os/xliff-core.html
 // http://docs.oasis-open.org/xliff/v1.2/xliff-profile-html/xliff-profile-html-1.2.html
@@ -44,34 +43,37 @@ export class Xliff implements Serializer {
 
       let transUnit = new xml.Tag(_UNIT_TAG, {id: id, datatype: 'html'});
       transUnit.children.push(
-          _CR(8), new xml.Tag(_SOURCE_TAG, {}, visitor.serialize(message.nodes)), _CR(8),
-          new xml.Tag(_TARGET_TAG));
+          new xml.CR(8), new xml.Tag(_SOURCE_TAG, {}, visitor.serialize(message.nodes)),
+          new xml.CR(8), new xml.Tag(_TARGET_TAG));
 
       if (message.description) {
         transUnit.children.push(
-            _CR(8),
+            new xml.CR(8),
             new xml.Tag(
                 'note', {priority: '1', from: 'description'}, [new xml.Text(message.description)]));
       }
 
       if (message.meaning) {
         transUnit.children.push(
-            _CR(8),
+            new xml.CR(8),
             new xml.Tag('note', {priority: '1', from: 'meaning'}, [new xml.Text(message.meaning)]));
       }
 
-      transUnit.children.push(_CR(6));
+      transUnit.children.push(new xml.CR(6));
 
-      transUnits.push(_CR(6), transUnit);
+      transUnits.push(new xml.CR(6), transUnit);
     });
 
-    const body = new xml.Tag('body', {}, [...transUnits, _CR(4)]);
+    const body = new xml.Tag('body', {}, [...transUnits, new xml.CR(4)]);
     const file = new xml.Tag(
         'file', {'source-language': _SOURCE_LANG, datatype: 'plaintext', original: 'ng2.template'},
-        [_CR(4), body, _CR(2)]);
-    const xliff = new xml.Tag('xliff', {version: _VERSION, xmlns: _XMLNS}, [_CR(2), file, _CR()]);
+        [new xml.CR(4), body, new xml.CR(2)]);
+    const xliff = new xml.Tag(
+        'xliff', {version: _VERSION, xmlns: _XMLNS}, [new xml.CR(2), file, new xml.CR()]);
 
-    return xml.serialize([new xml.Declaration({version: '1.0', encoding: 'UTF-8'}), _CR(), xliff]);
+    return xml.serialize([
+      new xml.Declaration({version: '1.0', encoding: 'UTF-8'}), new xml.CR(), xliff, new xml.CR()
+    ]);
   }
 
   load(content: string, url: string, messageBundle: MessageBundle): {[id: string]: ml.Node[]} {
diff --git a/modules/@angular/compiler/src/i18n/serializers/xmb.ts b/modules/@angular/compiler/src/i18n/serializers/xmb.ts
index e19391fd4b60..d582ef569bed 100644
--- a/modules/@angular/compiler/src/i18n/serializers/xmb.ts
+++ b/modules/@angular/compiler/src/i18n/serializers/xmb.ts
@@ -43,7 +43,6 @@ export class Xmb implements Serializer {
   write(messageMap: {[k: string]: i18n.Message}): string {
     const visitor = new _Visitor();
     let rootNode = new xml.Tag(_MESSAGES_TAG);
-    rootNode.children.push(new xml.Text('\n'));
 
     Object.keys(messageMap).forEach((id) => {
       const message = messageMap[id];
@@ -58,16 +57,18 @@ export class Xmb implements Serializer {
       }
 
       rootNode.children.push(
-          new xml.Text('  '), new xml.Tag(_MESSAGE_TAG, attrs, visitor.serialize(message.nodes)),
-          new xml.Text('\n'));
+          new xml.CR(2), new xml.Tag(_MESSAGE_TAG, attrs, visitor.serialize(message.nodes)));
     });
 
+    rootNode.children.push(new xml.CR());
+
     return xml.serialize([
       new xml.Declaration({version: '1.0', encoding: 'UTF-8'}),
-      new xml.Text('\n'),
+      new xml.CR(),
       new xml.Doctype(_MESSAGES_TAG, _DOCTYPE),
-      new xml.Text('\n'),
+      new xml.CR(),
       rootNode,
+      new xml.CR(),
     ]);
   }
 
diff --git a/modules/@angular/compiler/src/i18n/serializers/xml_helper.ts b/modules/@angular/compiler/src/i18n/serializers/xml_helper.ts
index d5d142581d87..e7cbc8bbcbc1 100644
--- a/modules/@angular/compiler/src/i18n/serializers/xml_helper.ts
+++ b/modules/@angular/compiler/src/i18n/serializers/xml_helper.ts
@@ -88,6 +88,10 @@ export class Text implements Node {
   visit(visitor: IVisitor): any { return visitor.visitText(this); }
 }
 
+export class CR extends Text {
+  constructor(ws: number = 0) { super(`\n${new Array(ws + 1).join(' ')}`); }
+}
+
 const _ESCAPED_CHARS: [RegExp, string][] = [
   [/&/g, '&amp;'],
   [/"/g, '&quot;'],
diff --git a/modules/@angular/compiler/test/i18n/serializers/xliff_spec.ts b/modules/@angular/compiler/test/i18n/serializers/xliff_spec.ts
index 48f376b23b73..5d9ea96a3bab 100644
--- a/modules/@angular/compiler/test/i18n/serializers/xliff_spec.ts
+++ b/modules/@angular/compiler/test/i18n/serializers/xliff_spec.ts
@@ -21,47 +21,49 @@ const HTML = `
 
 const WRITE_XLIFF = `<?xml version="1.0" encoding="UTF-8" ?>
 <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
- <file source-language="en" datatype="plaintext" original="ng2.template">
-   <body>
-     <trans-unit id="983775b9a51ce14b036be72d4cfd65d68d64e231" datatype="html">
-       <source>translatable attribute</source>
-       <target/>
-     </trans-unit>
-     <trans-unit id="ec1d033f2436133c14ab038286c4f5df4697484a" datatype="html">
-       <source>translatable element <x id="START_BOLD_TEXT" ctype="b"/>with placeholders<x id="CLOSE_BOLD_TEXT" ctype="b"/> <x id="INTERPOLATION"/></source>
-       <target/>
-     </trans-unit>
-     <trans-unit id="db3e0a6a5a96481f60aec61d98c3eecddef5ac23" datatype="html">
-       <source>foo</source>
-       <target/>
-       <note priority="1" from="description">d</note>
-       <note priority="1" from="meaning">m</note>
-     </trans-unit>
-   </body>
- </file>
-</xliff>`;
+  <file source-language="en" datatype="plaintext" original="ng2.template">
+    <body>
+      <trans-unit id="983775b9a51ce14b036be72d4cfd65d68d64e231" datatype="html">
+        <source>translatable attribute</source>
+        <target/>
+      </trans-unit>
+      <trans-unit id="ec1d033f2436133c14ab038286c4f5df4697484a" datatype="html">
+        <source>translatable element <x id="START_BOLD_TEXT" ctype="b"/>with placeholders<x id="CLOSE_BOLD_TEXT" ctype="b"/> <x id="INTERPOLATION"/></source>
+        <target/>
+      </trans-unit>
+      <trans-unit id="db3e0a6a5a96481f60aec61d98c3eecddef5ac23" datatype="html">
+        <source>foo</source>
+        <target/>
+        <note priority="1" from="description">d</note>
+        <note priority="1" from="meaning">m</note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
+`;
 
 const LOAD_XLIFF = `<?xml version="1.0" encoding="UTF-8" ?>
 <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
- <file source-language="en" datatype="plaintext" original="ng2.template">
-   <body>
-     <trans-unit id="983775b9a51ce14b036be72d4cfd65d68d64e231" datatype="html">
-       <source>translatable attribute</source>
-       <target>etubirtta elbatalsnart</target>
-     </trans-unit>
-     <trans-unit id="ec1d033f2436133c14ab038286c4f5df4697484a" datatype="html">
-       <source>translatable element <x id="START_BOLD_TEXT" ctype="b"/>with placeholders<x id="CLOSE_BOLD_TEXT" ctype="b"/> <x id="INTERPOLATION"/></source>
-       <target><x id="INTERPOLATION"/> footnemele elbatalsnart <x id="START_BOLD_TEXT" ctype="b"/>sredlohecalp htiw<x id="CLOSE_BOLD_TEXT" ctype="b"/></target>
-     </trans-unit>
-     <trans-unit id="db3e0a6a5a96481f60aec61d98c3eecddef5ac23" datatype="html">
-       <source>foo</source>
-       <target>oof</target>
-       <note priority="1" from="description">d</note>
-       <note priority="1" from="meaning">m</note>
-     </trans-unit>
-   </body>
- </file>
-</xliff>`;
+  <file source-language="en" datatype="plaintext" original="ng2.template">
+    <body>
+      <trans-unit id="983775b9a51ce14b036be72d4cfd65d68d64e231" datatype="html">
+        <source>translatable attribute</source>
+        <target>etubirtta elbatalsnart</target>
+      </trans-unit>
+      <trans-unit id="ec1d033f2436133c14ab038286c4f5df4697484a" datatype="html">
+        <source>translatable element <x id="START_BOLD_TEXT" ctype="b"/>with placeholders<x id="CLOSE_BOLD_TEXT" ctype="b"/> <x id="INTERPOLATION"/></source>
+        <target><x id="INTERPOLATION"/> footnemele elbatalsnart <x id="START_BOLD_TEXT" ctype="b"/>sredlohecalp htiw<x id="CLOSE_BOLD_TEXT" ctype="b"/></target>
+      </trans-unit>
+      <trans-unit id="db3e0a6a5a96481f60aec61d98c3eecddef5ac23" datatype="html">
+        <source>foo</source>
+        <target>oof</target>
+        <note priority="1" from="description">d</note>
+        <note priority="1" from="meaning">m</note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
+`;
 
 export function main(): void {
   let serializer: Xliff;
diff --git a/modules/@angular/compiler/test/i18n/serializers/xmb_spec.ts b/modules/@angular/compiler/test/i18n/serializers/xmb_spec.ts
index 9243474d4c59..89a5daa75ca9 100644
--- a/modules/@angular/compiler/test/i18n/serializers/xmb_spec.ts
+++ b/modules/@angular/compiler/test/i18n/serializers/xmb_spec.ts
@@ -6,12 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {MessageBundle} from '@angular/compiler/src/i18n/message_bundle';
 import {Xmb} from '@angular/compiler/src/i18n/serializers/xmb';
-import {describe, expect, it} from '@angular/core/testing/testing_internal';
-
-import {MessageBundle} from '../../../src/i18n/message_bundle';
-import {HtmlParser} from '../../../src/ml_parser/html_parser';
-import {DEFAULT_INTERPOLATION_CONFIG} from '../../../src/ml_parser/interpolation_config';
+import {HtmlParser} from '@angular/compiler/src/ml_parser/html_parser';
+import {DEFAULT_INTERPOLATION_CONFIG} from '@angular/compiler/src/ml_parser/interpolation_config';
 
 export function main(): void {
   describe('XMB serializer', () => {
@@ -49,7 +47,8 @@ export function main(): void {
   <msg id="e2ccf3d131b15f54aa1fcf1314b1ca77c14bfcc2">{ count, plural, =0 {<ph name="START_PARAGRAPH"><ex>&lt;p&gt;</ex></ph>test<ph name="CLOSE_PARAGRAPH"><ex>&lt;/p&gt;</ex></ph>} }</msg>
   <msg id="db3e0a6a5a96481f60aec61d98c3eecddef5ac23" desc="d" meaning="m">foo</msg>
   <msg id="83dd87699b8c1779dd72277ef6e2d46ca58be042">{ count, plural, =0 {{ sex, gender, other {<ph name="START_PARAGRAPH"><ex>&lt;p&gt;</ex></ph>deeply nested<ph name="CLOSE_PARAGRAPH"><ex>&lt;/p&gt;</ex></ph>} } } }</msg>
-</messagebundle>`;
+</messagebundle>
+`;
 
     it('should write a valid xmb file', () => { expect(toXmb(HTML)).toEqual(XMB); });
 

From 7578d8573b2a8e4c3c8e72d6878c84176b84d39b Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Fri, 30 Sep 2016 15:39:46 -0700
Subject: [PATCH 55/70] fix(xlif): fix `<x>` ctype names

fixes #12000
see http://docs.oasis-open.org/xliff/v1.2/os/xliff-core.html#ctype
---
 .../compiler/src/i18n/serializers/xliff.ts      | 17 +++++++++++++++--
 .../test/i18n/serializers/xliff_spec.ts         | 16 ++++++++++++++--
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/modules/@angular/compiler/src/i18n/serializers/xliff.ts b/modules/@angular/compiler/src/i18n/serializers/xliff.ts
index 08b0c84fa8f9..2600af3f7feb 100644
--- a/modules/@angular/compiler/src/i18n/serializers/xliff.ts
+++ b/modules/@angular/compiler/src/i18n/serializers/xliff.ts
@@ -139,13 +139,15 @@ class _WriteVisitor implements i18n.Visitor {
   }
 
   visitTagPlaceholder(ph: i18n.TagPlaceholder, context?: any): xml.Node[] {
-    const startTagPh = new xml.Tag(_PLACEHOLDER_TAG, {id: ph.startName, ctype: ph.tag});
+    const ctype = getCtypeForTag(ph.tag);
+
+    const startTagPh = new xml.Tag(_PLACEHOLDER_TAG, {id: ph.startName, ctype});
     if (ph.isVoid) {
       // void tags have no children nor closing tags
       return [startTagPh];
     }
 
-    const closeTagPh = new xml.Tag(_PLACEHOLDER_TAG, {id: ph.closeName, ctype: ph.tag});
+    const closeTagPh = new xml.Tag(_PLACEHOLDER_TAG, {id: ph.closeName, ctype});
 
     return [startTagPh, ...this.serialize(ph.children), closeTagPh];
   }
@@ -289,3 +291,14 @@ class _LoadVisitor implements ml.Visitor {
     this._errors.push(new I18nError(node.sourceSpan, message));
   }
 }
+
+function getCtypeForTag(tag: string): string {
+  switch (tag.toLowerCase()) {
+    case 'br':
+      return 'lb';
+    case 'img':
+      return 'image';
+    default:
+      return `x-${tag}`;
+  }
+}
\ No newline at end of file
diff --git a/modules/@angular/compiler/test/i18n/serializers/xliff_spec.ts b/modules/@angular/compiler/test/i18n/serializers/xliff_spec.ts
index 5d9ea96a3bab..a5322f94ff63 100644
--- a/modules/@angular/compiler/test/i18n/serializers/xliff_spec.ts
+++ b/modules/@angular/compiler/test/i18n/serializers/xliff_spec.ts
@@ -17,6 +17,7 @@ const HTML = `
 <p i18n-title title="translatable attribute">not translatable</p>
 <p i18n>translatable element <b>with placeholders</b> {{ interpolation}}</p>
 <p i18n="m|d">foo</p>
+<p i18n="ph names"><br><img><div></div></p>
 `;
 
 const WRITE_XLIFF = `<?xml version="1.0" encoding="UTF-8" ?>
@@ -28,7 +29,7 @@ const WRITE_XLIFF = `<?xml version="1.0" encoding="UTF-8" ?>
         <target/>
       </trans-unit>
       <trans-unit id="ec1d033f2436133c14ab038286c4f5df4697484a" datatype="html">
-        <source>translatable element <x id="START_BOLD_TEXT" ctype="b"/>with placeholders<x id="CLOSE_BOLD_TEXT" ctype="b"/> <x id="INTERPOLATION"/></source>
+        <source>translatable element <x id="START_BOLD_TEXT" ctype="x-b"/>with placeholders<x id="CLOSE_BOLD_TEXT" ctype="x-b"/> <x id="INTERPOLATION"/></source>
         <target/>
       </trans-unit>
       <trans-unit id="db3e0a6a5a96481f60aec61d98c3eecddef5ac23" datatype="html">
@@ -37,6 +38,11 @@ const WRITE_XLIFF = `<?xml version="1.0" encoding="UTF-8" ?>
         <note priority="1" from="description">d</note>
         <note priority="1" from="meaning">m</note>
       </trans-unit>
+      <trans-unit id="d7fa2d59aaedcaa5309f13028c59af8c85b8c49d" datatype="html">
+        <source><x id="LINE_BREAK" ctype="lb"/><x id="TAG_IMG" ctype="image"/><x id="START_TAG_DIV" ctype="x-div"/><x id="CLOSE_TAG_DIV" ctype="x-div"/></source>
+        <target/>
+        <note priority="1" from="description">ph names</note>
+      </trans-unit>      
     </body>
   </file>
 </xliff>
@@ -52,7 +58,7 @@ const LOAD_XLIFF = `<?xml version="1.0" encoding="UTF-8" ?>
       </trans-unit>
       <trans-unit id="ec1d033f2436133c14ab038286c4f5df4697484a" datatype="html">
         <source>translatable element <x id="START_BOLD_TEXT" ctype="b"/>with placeholders<x id="CLOSE_BOLD_TEXT" ctype="b"/> <x id="INTERPOLATION"/></source>
-        <target><x id="INTERPOLATION"/> footnemele elbatalsnart <x id="START_BOLD_TEXT" ctype="b"/>sredlohecalp htiw<x id="CLOSE_BOLD_TEXT" ctype="b"/></target>
+        <target><x id="INTERPOLATION"/> footnemele elbatalsnart <x id="START_BOLD_TEXT" ctype="x-b"/>sredlohecalp htiw<x id="CLOSE_BOLD_TEXT" ctype="x-b"/></target>
       </trans-unit>
       <trans-unit id="db3e0a6a5a96481f60aec61d98c3eecddef5ac23" datatype="html">
         <source>foo</source>
@@ -60,6 +66,11 @@ const LOAD_XLIFF = `<?xml version="1.0" encoding="UTF-8" ?>
         <note priority="1" from="description">d</note>
         <note priority="1" from="meaning">m</note>
       </trans-unit>
+      <trans-unit id="d7fa2d59aaedcaa5309f13028c59af8c85b8c49d" datatype="html">
+        <source><x id="LINE_BREAK" ctype="lb"/><x id="TAG_IMG" ctype="image"/><x id="START_TAG_DIV" ctype="x-div"/><x id="CLOSE_TAG_DIV" ctype="x-div"/></source>
+        <target><x id="START_TAG_DIV" ctype="x-div"/><x id="CLOSE_TAG_DIV" ctype="x-div"/><x id="TAG_IMG" ctype="image"/><x id="LINE_BREAK" ctype="lb"/></target>
+        <note priority="1" from="description">ph names</note>
+      </trans-unit>            
     </body>
   </file>
 </xliff>
@@ -105,6 +116,7 @@ export function main(): void {
           'ec1d033f2436133c14ab038286c4f5df4697484a':
               '{{ interpolation}} footnemele elbatalsnart <b>sredlohecalp htiw</b>',
           'db3e0a6a5a96481f60aec61d98c3eecddef5ac23': 'oof',
+          'd7fa2d59aaedcaa5309f13028c59af8c85b8c49d': '<div></div><img></img><br></br>',
         });
       });
     });

From 02a862f8af1b57702cb3e13f4e0e26388a196dea Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Fri, 30 Sep 2016 15:50:59 -0700
Subject: [PATCH 56/70] test(AstSerializer): fix serializing void tags

---
 .../compiler/test/i18n/serializers/xliff_spec.ts       |  4 ++--
 .../compiler/test/ml_parser/ast_serializer_spec.ts     | 10 +++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/modules/@angular/compiler/test/i18n/serializers/xliff_spec.ts b/modules/@angular/compiler/test/i18n/serializers/xliff_spec.ts
index a5322f94ff63..6a6b9a71cb08 100644
--- a/modules/@angular/compiler/test/i18n/serializers/xliff_spec.ts
+++ b/modules/@angular/compiler/test/i18n/serializers/xliff_spec.ts
@@ -42,7 +42,7 @@ const WRITE_XLIFF = `<?xml version="1.0" encoding="UTF-8" ?>
         <source><x id="LINE_BREAK" ctype="lb"/><x id="TAG_IMG" ctype="image"/><x id="START_TAG_DIV" ctype="x-div"/><x id="CLOSE_TAG_DIV" ctype="x-div"/></source>
         <target/>
         <note priority="1" from="description">ph names</note>
-      </trans-unit>      
+      </trans-unit>
     </body>
   </file>
 </xliff>
@@ -116,7 +116,7 @@ export function main(): void {
           'ec1d033f2436133c14ab038286c4f5df4697484a':
               '{{ interpolation}} footnemele elbatalsnart <b>sredlohecalp htiw</b>',
           'db3e0a6a5a96481f60aec61d98c3eecddef5ac23': 'oof',
-          'd7fa2d59aaedcaa5309f13028c59af8c85b8c49d': '<div></div><img></img><br></br>',
+          'd7fa2d59aaedcaa5309f13028c59af8c85b8c49d': '<div></div><img/><br/>',
         });
       });
     });
diff --git a/modules/@angular/compiler/test/ml_parser/ast_serializer_spec.ts b/modules/@angular/compiler/test/ml_parser/ast_serializer_spec.ts
index 15f181c3c777..129e2e76584e 100644
--- a/modules/@angular/compiler/test/ml_parser/ast_serializer_spec.ts
+++ b/modules/@angular/compiler/test/ml_parser/ast_serializer_spec.ts
@@ -6,9 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {beforeEach, describe, expect, it} from '../../../core/testing/testing_internal';
-import * as html from '../../src/ml_parser/ast';
-import {HtmlParser} from '../../src/ml_parser/html_parser';
+import * as html from '@angular/compiler/src/ml_parser/ast';
+import {HtmlParser} from '@angular/compiler/src/ml_parser/html_parser';
+import {getHtmlTagDefinition} from '@angular/compiler/src/ml_parser/html_tags';
 
 export function main() {
   describe('Node serializer', () => {
@@ -62,6 +62,10 @@ export function main() {
 
 class _SerializerVisitor implements html.Visitor {
   visitElement(element: html.Element, context: any): any {
+    if (getHtmlTagDefinition(element.name).isVoid) {
+      return `<${element.name}${this._visitAll(element.attrs, ' ')}/>`;
+    }
+
     return `<${element.name}${this._visitAll(element.attrs, ' ')}>${this._visitAll(element.children)}</${element.name}>`;
   }
 

From 5a8f1166876b56a8a13cb4620592e9221ba0c079 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Fri, 30 Sep 2016 16:22:42 -0700
Subject: [PATCH 57/70] text(offline compiler): fix expected output

---
 .../integrationtest/test/i18n_spec.ts         | 34 ++++++++++---------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/modules/@angular/compiler-cli/integrationtest/test/i18n_spec.ts b/modules/@angular/compiler-cli/integrationtest/test/i18n_spec.ts
index c4fdabd964cc..ace7ec35a584 100644
--- a/modules/@angular/compiler-cli/integrationtest/test/i18n_spec.ts
+++ b/modules/@angular/compiler-cli/integrationtest/test/i18n_spec.ts
@@ -36,25 +36,27 @@ const EXPECTED_XMB = `<?xml version="1.0" encoding="UTF-8" ?>
 <messagebundle>
   <msg id="76e1eccb1b772fa9f294ef9c146ea6d0efa8a2d4" desc="desc" meaning="meaning">translate me</msg>
   <msg id="65cc4ab3b4c438e07c89be2b677d08369fb62da2">Welcome</msg>
-</messagebundle>`;
+</messagebundle>
+`;
 
 const EXPECTED_XLIFF = `<?xml version="1.0" encoding="UTF-8" ?>
 <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
- <file source-language="en" datatype="plaintext" original="ng2.template">
-   <body>
-     <trans-unit id="76e1eccb1b772fa9f294ef9c146ea6d0efa8a2d4" datatype="html">
-       <source>translate me</source>
-       <target/>
-       <note priority="1" from="description">desc</note>
-       <note priority="1" from="meaning">meaning</note>
-     </trans-unit>
-     <trans-unit id="65cc4ab3b4c438e07c89be2b677d08369fb62da2" datatype="html">
-       <source>Welcome</source>
-       <target/>
-     </trans-unit>
-   </body>
- </file>
-</xliff>`;
+  <file source-language="en" datatype="plaintext" original="ng2.template">
+    <body>
+      <trans-unit id="76e1eccb1b772fa9f294ef9c146ea6d0efa8a2d4" datatype="html">
+        <source>translate me</source>
+        <target/>
+        <note priority="1" from="description">desc</note>
+        <note priority="1" from="meaning">meaning</note>
+      </trans-unit>
+      <trans-unit id="65cc4ab3b4c438e07c89be2b677d08369fb62da2" datatype="html">
+        <source>Welcome</source>
+        <target/>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
+`;
 
 describe('template i18n extraction output', () => {
   const outDir = '';

From db00ba7ae70338ce2291c13d4e44346833b0d841 Mon Sep 17 00:00:00 2001
From: Alex Eagle <eagle@post.harvard.edu>
Date: Sun, 2 Oct 2016 14:12:14 -0700
Subject: [PATCH 58/70] refactor(facade): remove DateWrapper (#12027)

---
 modules/@angular/benchpress/src/common_options.ts   |  4 +---
 .../benchpress/src/reporter/json_file_reporter.ts   |  5 ++---
 .../test/reporter/console_reporter_spec.ts          |  4 ++--
 .../test/reporter/json_file_reporter_spec.ts        |  6 +++---
 .../benchpress/test/reporter/multi_reporter_spec.ts |  8 +++-----
 modules/@angular/benchpress/test/sampler_spec.ts    |  6 +++---
 .../validator/regression_slope_validator_spec.ts    |  3 +--
 .../test/validator/size_validator_spec.ts           |  3 +--
 .../@angular/common/test/pipes/date_pipe_spec.ts    |  4 +---
 modules/@angular/facade/src/lang.ts                 | 13 -------------
 .../src/web_workers/shared/client_message_broker.ts |  4 ++--
 .../src/old/compiler/compiler_benchmark.ts          |  6 +++---
 modules/playground/src/routing/app/inbox-app.ts     |  7 ++-----
 13 files changed, 24 insertions(+), 49 deletions(-)

diff --git a/modules/@angular/benchpress/src/common_options.ts b/modules/@angular/benchpress/src/common_options.ts
index 7dc5b72730c3..255862e629d3 100644
--- a/modules/@angular/benchpress/src/common_options.ts
+++ b/modules/@angular/benchpress/src/common_options.ts
@@ -9,8 +9,6 @@
 import {OpaqueToken} from '@angular/core';
 import * as fs from 'fs';
 
-import {DateWrapper} from './facade/lang';
-
 export class Options {
   static SAMPLE_ID = new OpaqueToken('Options.sampleId');
   static DEFAULT_DESCRIPTION = new OpaqueToken('Options.defaultDescription');
@@ -34,7 +32,7 @@ export class Options {
     {provide: Options.FORCE_GC, useValue: false},
     {provide: Options.PREPARE, useValue: Options.NO_PREPARE},
     {provide: Options.MICRO_METRICS, useValue: {}}, {provide: Options.USER_METRICS, useValue: {}},
-    {provide: Options.NOW, useValue: () => DateWrapper.now()},
+    {provide: Options.NOW, useValue: () => new Date()},
     {provide: Options.RECEIVED_DATA, useValue: false},
     {provide: Options.REQUEST_COUNT, useValue: false},
     {provide: Options.CAPTURE_FRAMES, useValue: false},
diff --git a/modules/@angular/benchpress/src/reporter/json_file_reporter.ts b/modules/@angular/benchpress/src/reporter/json_file_reporter.ts
index db64677881d3..67c28a592b92 100644
--- a/modules/@angular/benchpress/src/reporter/json_file_reporter.ts
+++ b/modules/@angular/benchpress/src/reporter/json_file_reporter.ts
@@ -9,7 +9,7 @@
 import {Inject, Injectable, OpaqueToken} from '@angular/core';
 
 import {Options} from '../common_options';
-import {DateWrapper, Json} from '../facade/lang';
+import {Json} from '../facade/lang';
 import {MeasureValues} from '../measure_values';
 import {Reporter} from '../reporter';
 import {SampleDescription} from '../sample_description';
@@ -45,8 +45,7 @@ export class JsonFileReporter extends Reporter {
       'completeSample': completeSample,
       'validSample': validSample,
     });
-    var filePath =
-        `${this._path}/${this._description.id}_${DateWrapper.toMillis(this._now())}.json`;
+    var filePath = `${this._path}/${this._description.id}_${this._now().getTime()}.json`;
     return this._writeFile(filePath, content);
   }
 }
diff --git a/modules/@angular/benchpress/test/reporter/console_reporter_spec.ts b/modules/@angular/benchpress/test/reporter/console_reporter_spec.ts
index c3b1a093fa21..6420ba30c666 100644
--- a/modules/@angular/benchpress/test/reporter/console_reporter_spec.ts
+++ b/modules/@angular/benchpress/test/reporter/console_reporter_spec.ts
@@ -10,7 +10,7 @@ import {Provider} from '@angular/core';
 import {describe, expect, it} from '@angular/core/testing/testing_internal';
 
 import {ConsoleReporter, MeasureValues, ReflectiveInjector, SampleDescription} from '../../index';
-import {DateWrapper, isBlank, isPresent} from '../../src/facade/lang';
+import {isBlank, isPresent} from '../../src/facade/lang';
 
 export function main() {
   describe('console reporter', () => {
@@ -90,5 +90,5 @@ export function main() {
 }
 
 function mv(runIndex: number, time: number, values: {[key: string]: number}) {
-  return new MeasureValues(runIndex, DateWrapper.fromMillis(time), values);
+  return new MeasureValues(runIndex, new Date(time), values);
 }
diff --git a/modules/@angular/benchpress/test/reporter/json_file_reporter_spec.ts b/modules/@angular/benchpress/test/reporter/json_file_reporter_spec.ts
index f5ce8027d9df..3036f6c33e9a 100644
--- a/modules/@angular/benchpress/test/reporter/json_file_reporter_spec.ts
+++ b/modules/@angular/benchpress/test/reporter/json_file_reporter_spec.ts
@@ -9,7 +9,7 @@
 import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
 
 import {JsonFileReporter, MeasureValues, Options, ReflectiveInjector, SampleDescription} from '../../index';
-import {DateWrapper, Json, isPresent} from '../../src/facade/lang';
+import {Json, isPresent} from '../../src/facade/lang';
 
 export function main() {
   describe('file reporter', () => {
@@ -27,7 +27,7 @@ export function main() {
           useValue: new SampleDescription(sampleId, descriptions, metrics)
         },
         {provide: JsonFileReporter.PATH, useValue: path},
-        {provide: Options.NOW, useValue: () => DateWrapper.fromMillis(1234)}, {
+        {provide: Options.NOW, useValue: () => new Date(1234)}, {
           provide: Options.WRITE_FILE,
           useValue: (filename: string, content: string) => {
             loggedFile = {'filename': filename, 'content': content};
@@ -77,5 +77,5 @@ export function main() {
 }
 
 function mv(runIndex: number, time: number, values: {[key: string]: number}) {
-  return new MeasureValues(runIndex, DateWrapper.fromMillis(time), values);
+  return new MeasureValues(runIndex, new Date(time), values);
 }
diff --git a/modules/@angular/benchpress/test/reporter/multi_reporter_spec.ts b/modules/@angular/benchpress/test/reporter/multi_reporter_spec.ts
index 89b0c371f460..c880fc63931b 100644
--- a/modules/@angular/benchpress/test/reporter/multi_reporter_spec.ts
+++ b/modules/@angular/benchpress/test/reporter/multi_reporter_spec.ts
@@ -9,7 +9,6 @@
 import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
 
 import {MeasureValues, MultiReporter, ReflectiveInjector, Reporter} from '../../index';
-import {DateWrapper} from '../../src/facade/lang';
 
 export function main() {
   function createReporters(ids: any[]) {
@@ -26,7 +25,7 @@ export function main() {
 
     it('should reportMeasureValues to all',
        inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
-         var mv = new MeasureValues(0, DateWrapper.now(), {});
+         var mv = new MeasureValues(0, new Date(), {});
          createReporters(['m1', 'm2']).then((r) => r.reportMeasureValues(mv)).then((values) => {
 
            expect(values).toEqual([{'id': 'm1', 'values': mv}, {'id': 'm2', 'values': mv}]);
@@ -35,9 +34,8 @@ export function main() {
        }));
 
     it('should reportSample to call', inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
-         var completeSample = [
-           new MeasureValues(0, DateWrapper.now(), {}), new MeasureValues(1, DateWrapper.now(), {})
-         ];
+         var completeSample =
+             [new MeasureValues(0, new Date(), {}), new MeasureValues(1, new Date(), {})];
          var validSample = [completeSample[1]];
 
          createReporters(['m1', 'm2'])
diff --git a/modules/@angular/benchpress/test/sampler_spec.ts b/modules/@angular/benchpress/test/sampler_spec.ts
index 345d2865adb9..b52f4b2dea94 100644
--- a/modules/@angular/benchpress/test/sampler_spec.ts
+++ b/modules/@angular/benchpress/test/sampler_spec.ts
@@ -9,7 +9,7 @@
 import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
 
 import {MeasureValues, Metric, Options, ReflectiveInjector, Reporter, Sampler, Validator, WebDriverAdapter} from '../index';
-import {DateWrapper, isBlank, isPresent} from '../src/facade/lang';
+import {isBlank, isPresent} from '../src/facade/lang';
 
 export function main() {
   var EMPTY_EXECUTE = () => {};
@@ -39,7 +39,7 @@ export function main() {
         Options.DEFAULT_PROVIDERS, Sampler.PROVIDERS, {provide: Metric, useValue: metric},
         {provide: Reporter, useValue: reporter}, {provide: WebDriverAdapter, useValue: driver},
         {provide: Options.EXECUTE, useValue: execute}, {provide: Validator, useValue: validator},
-        {provide: Options.NOW, useValue: () => DateWrapper.fromMillis(time++)}
+        {provide: Options.NOW, useValue: () => new Date(time++)}
       ];
       if (isPresent(prepare)) {
         providers.push({provide: Options.PREPARE, useValue: prepare});
@@ -204,7 +204,7 @@ export function main() {
 }
 
 function mv(runIndex: number, time: number, values: {[key: string]: number}) {
-  return new MeasureValues(runIndex, DateWrapper.fromMillis(time), values);
+  return new MeasureValues(runIndex, new Date(time), values);
 }
 
 function createCountingValidator(
diff --git a/modules/@angular/benchpress/test/validator/regression_slope_validator_spec.ts b/modules/@angular/benchpress/test/validator/regression_slope_validator_spec.ts
index 66e2a262dbc0..9b7be2606334 100644
--- a/modules/@angular/benchpress/test/validator/regression_slope_validator_spec.ts
+++ b/modules/@angular/benchpress/test/validator/regression_slope_validator_spec.ts
@@ -10,7 +10,6 @@ import {describe, expect, it} from '@angular/core/testing/testing_internal';
 
 import {MeasureValues, ReflectiveInjector, RegressionSlopeValidator} from '../../index';
 import {ListWrapper} from '../../src/facade/collection';
-import {DateWrapper} from '../../src/facade/lang';
 
 export function main() {
   describe('regression slope validator', () => {
@@ -62,5 +61,5 @@ export function main() {
 }
 
 function mv(runIndex: number, time: number, values: {[key: string]: number}) {
-  return new MeasureValues(runIndex, DateWrapper.fromMillis(time), values);
+  return new MeasureValues(runIndex, new Date(time), values);
 }
diff --git a/modules/@angular/benchpress/test/validator/size_validator_spec.ts b/modules/@angular/benchpress/test/validator/size_validator_spec.ts
index b75358798b64..6cdb21eff80a 100644
--- a/modules/@angular/benchpress/test/validator/size_validator_spec.ts
+++ b/modules/@angular/benchpress/test/validator/size_validator_spec.ts
@@ -10,7 +10,6 @@ import {describe, expect, it} from '@angular/core/testing/testing_internal';
 
 import {MeasureValues, ReflectiveInjector, SizeValidator} from '../../index';
 import {ListWrapper} from '../../src/facade/collection';
-import {DateWrapper} from '../../src/facade/lang';
 
 export function main() {
   describe('size validator', () => {
@@ -47,5 +46,5 @@ export function main() {
 }
 
 function mv(runIndex: number, time: number, values: {[key: string]: number}) {
-  return new MeasureValues(runIndex, DateWrapper.fromMillis(time), values);
+  return new MeasureValues(runIndex, new Date(time), values);
 }
diff --git a/modules/@angular/common/test/pipes/date_pipe_spec.ts b/modules/@angular/common/test/pipes/date_pipe_spec.ts
index 32c88cf203a3..2667f88e1f99 100644
--- a/modules/@angular/common/test/pipes/date_pipe_spec.ts
+++ b/modules/@angular/common/test/pipes/date_pipe_spec.ts
@@ -11,8 +11,6 @@ import {PipeResolver} from '@angular/compiler/src/pipe_resolver';
 import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal';
 import {browserDetection} from '@angular/platform-browser/testing/browser_util';
 
-import {DateWrapper} from '../../src/facade/lang';
-
 export function main() {
   describe('DatePipe', () => {
     var date: Date;
@@ -27,7 +25,7 @@ export function main() {
     // Tracking issue: https://github.com/angular/angular/issues/11187
 
     beforeEach(() => {
-      date = DateWrapper.create(2015, 6, 15, 9, 3, 1);
+      date = new Date(2015, 5, 15, 9, 3, 1);
       pipe = new DatePipe('en-US');
     });
 
diff --git a/modules/@angular/facade/src/lang.ts b/modules/@angular/facade/src/lang.ts
index 5cc46d0405ac..982528761fbb 100644
--- a/modules/@angular/facade/src/lang.ts
+++ b/modules/@angular/facade/src/lang.ts
@@ -301,19 +301,6 @@ export class Json {
   }
 }
 
-export class DateWrapper {
-  static create(
-      year: number, month: number = 1, day: number = 1, hour: number = 0, minutes: number = 0,
-      seconds: number = 0, milliseconds: number = 0): Date {
-    return new Date(year, month - 1, day, hour, minutes, seconds, milliseconds);
-  }
-  static fromISOString(str: string): Date { return new Date(str); }
-  static fromMillis(ms: number): Date { return new Date(ms); }
-  static toMillis(date: Date): number { return date.getTime(); }
-  static now(): Date { return new Date(); }
-  static toJson(date: Date): string { return date.toJSON(); }
-}
-
 export function setValueOnPath(global: any, path: string, value: any) {
   var parts = path.split('.');
   var obj: any = global;
diff --git a/modules/@angular/platform-webworker/src/web_workers/shared/client_message_broker.ts b/modules/@angular/platform-webworker/src/web_workers/shared/client_message_broker.ts
index f450417d6f98..5f8e1bd04b80 100644
--- a/modules/@angular/platform-webworker/src/web_workers/shared/client_message_broker.ts
+++ b/modules/@angular/platform-webworker/src/web_workers/shared/client_message_broker.ts
@@ -9,7 +9,7 @@
 import {Injectable, Type} from '@angular/core';
 
 import {EventEmitter} from '../../facade/async';
-import {DateWrapper, StringWrapper, isPresent, print, stringify} from '../../facade/lang';
+import {StringWrapper, isPresent, print, stringify} from '../../facade/lang';
 
 import {MessageBus} from './message_bus';
 import {Serializer} from './serializer';
@@ -71,7 +71,7 @@ export class ClientMessageBroker_ extends ClientMessageBroker {
   }
 
   private _generateMessageId(name: string): string {
-    var time: string = stringify(DateWrapper.toMillis(DateWrapper.now()));
+    var time: string = stringify(new Date().getTime());
     var iteration: number = 0;
     var id: string = name + time + stringify(iteration);
     while (isPresent((this as any /** TODO #9100 */)._pending[id])) {
diff --git a/modules/benchmarks/src/old/compiler/compiler_benchmark.ts b/modules/benchmarks/src/old/compiler/compiler_benchmark.ts
index d0f87ff88ab1..c5a4bc5f0bb2 100644
--- a/modules/benchmarks/src/old/compiler/compiler_benchmark.ts
+++ b/modules/benchmarks/src/old/compiler/compiler_benchmark.ts
@@ -1,6 +1,6 @@
 import {PromiseWrapper} from '@angular/facade/src/async';
 import {ListWrapper, Map, MapWrapper} from '@angular/facade/src/collection';
-import {DateWrapper, Type, isPresent, print} from '@angular/facade/src/lang';
+import {Type, isPresent, print} from '@angular/facade/src/lang';
 import {bootstrap} from '@angular/platform-browser';
 import {BrowserDomAdapter} from '@angular/platform-browser/src/browser/browser_adapter';
 import {DOM} from '@angular/platform-browser/src/dom/dom_adapter';
@@ -44,10 +44,10 @@ export function main() {
 
 function measureWrapper(func, desc) {
   return function() {
-    var begin = DateWrapper.now();
+    var begin = new Date();
     print(`[${desc}] Begin...`);
     var onSuccess = function(_) {
-      var elapsedMs = DateWrapper.toMillis(DateWrapper.now()) - DateWrapper.toMillis(begin);
+      var elapsedMs = new Date().getTime() - begin.getTime();
       print(`[${desc}] ...done, took ${elapsedMs} ms`);
     };
     var onError = function(e) { DOM.logError(e); };
diff --git a/modules/playground/src/routing/app/inbox-app.ts b/modules/playground/src/routing/app/inbox-app.ts
index e756397cf49e..3b0a4055ed02 100644
--- a/modules/playground/src/routing/app/inbox-app.ts
+++ b/modules/playground/src/routing/app/inbox-app.ts
@@ -8,7 +8,7 @@
 
 
 import {Component, Injectable} from '@angular/core';
-import {DateWrapper, isPresent} from '@angular/core/src/facade/lang';
+import {isPresent} from '@angular/core/src/facade/lang';
 import {ActivatedRoute, Router} from '@angular/router';
 
 import * as db from './data';
@@ -102,10 +102,7 @@ export class InboxCmp {
         if (sortEmailsByDate) {
           this.items.sort(
               (a: InboxRecord, b: InboxRecord) =>
-                  DateWrapper.toMillis(DateWrapper.fromISOString(a.date)) <
-                      DateWrapper.toMillis(DateWrapper.fromISOString(b.date)) ?
-                  -1 :
-                  1);
+                  new Date(a.date).getTime() < new Date(b.date).getTime() ? -1 : 1);
         }
       });
     });

From e102cd4757f4087aeb1ac14661bb1311895e5e1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Antonio=20Chio?= <imagentlemail@gmail.com>
Date: Sun, 2 Oct 2016 16:19:47 -0500
Subject: [PATCH 59/70] docs(DEVELOPER.md): fix typos on "Tests" section
 (#12029)

---
 DEVELOPER.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DEVELOPER.md b/DEVELOPER.md
index ac7e15f44f35..2ce368ab814f 100644
--- a/DEVELOPER.md
+++ b/DEVELOPER.md
@@ -114,7 +114,7 @@ You should execute the 3 test suites before submitting a PR to github.
 All the tests are executed on our Continuous Integration infrastructure and a PR could only be merged once the tests pass.
 
 - CircleCI fails if your code is not formatted properly,
-- Travis CI fails if any of the test suite describe above fails.
+- Travis CI fails if any of the test suites described above fails.
 
 ## Update the public API tests
 

From 3067ce6eb4843a1aee6bedad17f9bae7b24ce088 Mon Sep 17 00:00:00 2001
From: Ben Elliott <bengelliott@gmail.com>
Date: Mon, 3 Oct 2016 18:19:03 +0100
Subject: [PATCH 60/70] docs(NgModule): Fixed docs for NgModule.entryComponents
 (#12006)

* docs(NgModule): Corrected the wording of the documentation of `entryComponents`, fixed some minor grammar issues

* docs(NgModule): Remove redundant ComponentFactory mentions

* docs(NgModule): Restore ComponentFactory/ComponentResolver links
---
 .../@angular/core/src/metadata/ng_module.ts   | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/modules/@angular/core/src/metadata/ng_module.ts b/modules/@angular/core/src/metadata/ng_module.ts
index 180c65b781ea..1cad93d0d849 100644
--- a/modules/@angular/core/src/metadata/ng_module.ts
+++ b/modules/@angular/core/src/metadata/ng_module.ts
@@ -29,7 +29,7 @@ export interface SchemaMetadata { name: string; }
 
 /**
  * Defines a schema that will allow:
- * - any non-angular elements with a `-` in their name,
+ * - any non-Angular elements with a `-` in their name,
  * - any properties on elements with a `-` in their name which is the common rule for custom
  * elements.
  *
@@ -132,9 +132,9 @@ export interface NgModule {
   imports?: Array<Type<any>|ModuleWithProviders|any[]>;
 
   /**
-   * Specifies a list of directives/pipes/module that can be used within the template
-   * of any component that is part of an angular module
-   * that imports this angular module.
+   * Specifies a list of directives/pipes/modules that can be used within the template
+   * of any component that is part of an Angular module
+   * that imports this Angular module.
    *
    * ### Example
    *
@@ -149,10 +149,9 @@ export interface NgModule {
   exports?: Array<Type<any>|any[]>;
 
   /**
-   * Defines the components that should be compiled as well when
-   * this component is defined. For each components listed here,
-   * Angular will create a {@link ComponentFactory ComponentFactory} and store it in the
-   * {@link ComponentFactoryResolver ComponentFactoryResolver}.
+   * Specifies a list of components that should be compiled when this module is defined.
+   * For each component listed here, Angular will create a {@link ComponentFactory}
+   * and store it in the {@link ComponentFactoryResolver}.
    */
   entryComponents?: Array<Type<any>|any[]>;
 
@@ -164,7 +163,7 @@ export interface NgModule {
   bootstrap?: Array<Type<any>|any[]>;
 
   /**
-   * Elements and properties that are not angular Components nor Directives have to be declared in
+   * Elements and properties that are not Angular components nor directives have to be declared in
    * the schema.
    *
    * Available schemas:
@@ -186,7 +185,7 @@ export interface NgModule {
 }
 
 /**
- * NgModule decorator and metadata
+ * NgModule decorator and metadata.
  *
  * @stable
  * @Annotation

From adb17fed98353a6eb8ea8c1750c6449b45cd8ceb Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Mon, 3 Oct 2016 15:27:56 -0700
Subject: [PATCH 61/70] fix(Header): preserve case of the first init, `set()`
 or `append()` (#12023)

fixes #11624
---
 modules/@angular/http/src/headers.ts       | 132 ++++++++--------
 modules/@angular/http/test/headers_spec.ts | 168 +++++++++++++--------
 tools/public_api_guard/http/index.d.ts     |  12 +-
 3 files changed, 178 insertions(+), 134 deletions(-)

diff --git a/modules/@angular/http/src/headers.ts b/modules/@angular/http/src/headers.ts
index 9eb16ac31a51..b656f315a9b5 100644
--- a/modules/@angular/http/src/headers.ts
+++ b/modules/@angular/http/src/headers.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ListWrapper, MapWrapper, StringMapWrapper, isListLikeIterable, iterateListLike} from '../src/facade/collection';
+import {MapWrapper} from '../src/facade/collection';
 
 /**
  * Polyfill for [Headers](https://developer.mozilla.org/en-US/docs/Web/API/Headers/Headers), as
@@ -15,7 +15,7 @@ import {ListWrapper, MapWrapper, StringMapWrapper, isListLikeIterable, iterateLi
  * The only known difference between this `Headers` implementation and the spec is the
  * lack of an `entries` method.
  *
- * ### Example ([live demo](http://plnkr.co/edit/MTdwT6?p=preview))
+ * ### Example
  *
  * ```
  * import {Headers} from '@angular/http';
@@ -37,23 +37,31 @@ import {ListWrapper, MapWrapper, StringMapWrapper, isListLikeIterable, iterateLi
  * @experimental
  */
 export class Headers {
-  /** @internal */
-  _headersMap: Map<string, string[]>;
-  constructor(headers?: Headers|{[key: string]: any}) {
-    if (headers instanceof Headers) {
-      this._headersMap = new Map<string, string[]>((<Headers>headers)._headersMap);
+  /** @internal header names are lower case */
+  _headers: Map<string, string[]> = new Map();
+  /** @internal map lower case names to actual names */
+  _normalizedNames: Map<string, string> = new Map();
+
+  // TODO(vicb): any -> string|string[]
+  constructor(headers?: Headers|{[name: string]: any}) {
+    if (!headers) {
       return;
     }
 
-    this._headersMap = new Map<string, string[]>();
-
-    if (!headers) {
+    if (headers instanceof Headers) {
+      headers._headers.forEach((value: string[], name: string) => {
+        const lcName = name.toLowerCase();
+        this._headers.set(lcName, value);
+        this.mayBeSetNormalizedName(name);
+      });
       return;
     }
 
-    // headers instanceof StringMap
-    StringMapWrapper.forEach(headers, (v: any, k: string) => {
-      this._headersMap.set(normalize(k), isListLikeIterable(v) ? v : [v]);
+    Object.keys(headers).forEach((name: string) => {
+      const value = headers[name];
+      const lcName = name.toLowerCase();
+      this._headers.set(lcName, Array.isArray(value) ? value : [value]);
+      this.mayBeSetNormalizedName(name);
     });
   }
 
@@ -61,14 +69,14 @@ export class Headers {
    * Returns a new Headers instance from the given DOMString of Response Headers
    */
   static fromResponseHeaderString(headersString: string): Headers {
-    let headers = new Headers();
+    const headers = new Headers();
 
     headersString.split('\n').forEach(line => {
       const index = line.indexOf(':');
       if (index > 0) {
-        const key = line.substring(0, index);
-        const value = line.substring(index + 1).trim();
-        headers.set(key, value);
+        const name = line.slice(0, index);
+        const value = line.slice(index + 1).trim();
+        headers.set(name, value);
       }
     });
 
@@ -79,92 +87,94 @@ export class Headers {
    * Appends a header to existing list of header values for a given header name.
    */
   append(name: string, value: string): void {
-    name = normalize(name);
-    var mapName = this._headersMap.get(name);
-    var list = isListLikeIterable(mapName) ? mapName : [];
-    list.push(value);
-    this._headersMap.set(name, list);
+    const values = this.getAll(name);
+    this.set(name, values === null ? [value] : [...values, value]);
   }
 
   /**
    * Deletes all header values for the given name.
    */
-  delete (name: string): void { this._headersMap.delete(normalize(name)); }
+  delete (name: string): void {
+    const lcName = name.toLowerCase();
+    this._normalizedNames.delete(lcName);
+    this._headers.delete(lcName);
+  }
 
   forEach(fn: (values: string[], name: string, headers: Map<string, string[]>) => void): void {
-    this._headersMap.forEach(fn);
+    this._headers.forEach(
+        (values, lcName) => fn(values, this._normalizedNames.get(lcName), this._headers));
   }
 
   /**
    * Returns first header that matches given name.
    */
-  get(header: string): string { return ListWrapper.first(this._headersMap.get(normalize(header))); }
+  get(name: string): string {
+    const values = this.getAll(name);
+
+    if (values === null) {
+      return null;
+    }
+
+    return values.length > 0 ? values[0] : null;
+  }
 
   /**
-   * Check for existence of header by given name.
+   * Checks for existence of header by given name.
    */
-  has(header: string): boolean { return this._headersMap.has(normalize(header)); }
+  has(name: string): boolean { return this._headers.has(name.toLowerCase()); }
 
   /**
-   * Provides names of set headers
+   * Returns the names of the headers
    */
-  keys(): string[] { return MapWrapper.keys(this._headersMap); }
+  keys(): string[] { return MapWrapper.values(this._normalizedNames); }
 
   /**
    * Sets or overrides header value for given name.
    */
-  set(header: string, value: string|string[]): void {
-    var list: string[] = [];
-
-    if (isListLikeIterable(value)) {
-      var pushValue = (<string[]>value).join(',');
-      list.push(pushValue);
-    } else {
-      list.push(<string>value);
-    }
-
-    this._headersMap.set(normalize(header), list);
+  set(name: string, value: string|string[]): void {
+    const strValue = Array.isArray(value) ? value.join(',') : value;
+    this._headers.set(name.toLowerCase(), [strValue]);
+    this.mayBeSetNormalizedName(name);
   }
 
   /**
    * Returns values of all headers.
    */
-  values(): string[][] { return MapWrapper.values(this._headersMap); }
+  values(): string[][] { return MapWrapper.values(this._headers); }
 
   /**
    * Returns string of all headers.
    */
-  toJSON(): {[key: string]: any} {
-    let serializableHeaders = {};
-    this._headersMap.forEach((values: string[], name: string) => {
-      let list: any[] /** TODO #9100 */ = [];
-
-      iterateListLike(
-          values, (val: any /** TODO #9100 */) => list = ListWrapper.concat(list, val.split(',')));
-
-      (serializableHeaders as any /** TODO #9100 */)[normalize(name)] = list;
+  // TODO(vicb): returns {[name: string]: string[]}
+  toJSON(): {[name: string]: any} {
+    const serialized: {[name: string]: string[]} = {};
+
+    this._headers.forEach((values: string[], name: string) => {
+      const split: string[] = [];
+      values.forEach(v => split.push(...v.split(',')));
+      serialized[this._normalizedNames.get(name)] = split;
     });
-    return serializableHeaders;
+
+    return serialized;
   }
 
   /**
    * Returns list of header values for a given name.
    */
-  getAll(header: string): string[] {
-    var headers = this._headersMap.get(normalize(header));
-    return isListLikeIterable(headers) ? headers : [];
+  getAll(name: string): string[] {
+    return this.has(name) ? this._headers.get(name.toLowerCase()) : null;
   }
 
   /**
    * This method is not implemented.
    */
   entries() { throw new Error('"entries" method is not implemented on Headers class'); }
-}
 
-// "HTTP character sets are identified by case-insensitive tokens"
-// Spec at https://tools.ietf.org/html/rfc2616
-// This implementation is same as NodeJS.
-// see https://nodejs.org/dist/latest-v6.x/docs/api/http.html#http_message_headers
-function normalize(name: string): string {
-  return name.toLowerCase();
+  private mayBeSetNormalizedName(name: string): void {
+    const lcName = name.toLowerCase();
+
+    if (!this._normalizedNames.has(lcName)) {
+      this._normalizedNames.set(lcName, name);
+    }
+  }
 }
diff --git a/modules/@angular/http/test/headers_spec.ts b/modules/@angular/http/test/headers_spec.ts
index c31c9111f493..3744f6c10c5c 100644
--- a/modules/@angular/http/test/headers_spec.ts
+++ b/modules/@angular/http/test/headers_spec.ts
@@ -6,46 +6,36 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal';
-import {Json} from '../src/facade/lang';
 import {Headers} from '../src/headers';
 
 export function main() {
   describe('Headers', () => {
-    it('should conform to spec', () => {
-      // Examples borrowed from https://developer.mozilla.org/en-US/docs/Web/API/Headers/Headers
-      // Spec at https://fetch.spec.whatwg.org/#dom-headers
-      var firstHeaders = new Headers();  // Currently empty
-      firstHeaders.append('Content-Type', 'image/jpeg');
-      expect(firstHeaders.get('Content-Type')).toBe('image/jpeg');
-      // "HTTP character sets are identified by case-insensitive tokens"
-      // Spec at https://tools.ietf.org/html/rfc2616
-      expect(firstHeaders.get('content-type')).toBe('image/jpeg');
-      expect(firstHeaders.get('content-Type')).toBe('image/jpeg');
-      const httpHeaders = {
-        'Content-Type': 'image/jpeg',
-        'Accept-Charset': 'utf-8',
-        'X-My-Custom-Header': 'Zeke are cool',
-      };
-      const secondHeaders = new Headers(httpHeaders);
-      const secondHeadersObj = new Headers(secondHeaders);
-      expect(secondHeadersObj.get('Content-Type')).toBe('image/jpeg');
-    });
-
 
     describe('initialization', () => {
+      it('should conform to spec', () => {
+        const httpHeaders = {
+          'Content-Type': 'image/jpeg',
+          'Accept-Charset': 'utf-8',
+          'X-My-Custom-Header': 'Zeke are cool',
+        };
+        const secondHeaders = new Headers(httpHeaders);
+        const secondHeadersObj = new Headers(secondHeaders);
+        expect(secondHeadersObj.get('Content-Type')).toEqual('image/jpeg');
+      });
+
       it('should merge values in provided dictionary', () => {
         const headers = new Headers({'foo': 'bar'});
-        expect(headers.get('foo')).toBe('bar');
+        expect(headers.get('foo')).toEqual('bar');
         expect(headers.getAll('foo')).toEqual(['bar']);
       });
+
       it('should not alter the values of a provided header template', () => {
         // Spec at https://fetch.spec.whatwg.org/#concept-headers-fill
         // test for https://github.com/angular/angular/issues/6845
         const firstHeaders = new Headers();
         const secondHeaders = new Headers(firstHeaders);
         secondHeaders.append('Content-Type', 'image/jpeg');
-        expect(firstHeaders.has('Content-Type')).toBeFalsy();
+        expect(firstHeaders.has('Content-Type')).toEqual(false);
       });
     });
 
@@ -53,56 +43,104 @@ export function main() {
     describe('.set()', () => {
       it('should clear all values and re-set for the provided key', () => {
         const headers = new Headers({'foo': 'bar'});
-        expect(headers.get('foo')).toBe('bar');
-        expect(headers.getAll('foo')).toEqual(['bar']);
+        expect(headers.get('foo')).toEqual('bar');
+
         headers.set('foo', 'baz');
-        expect(headers.get('foo')).toBe('baz');
-        expect(headers.getAll('foo')).toEqual(['baz']);
+        expect(headers.get('foo')).toEqual('baz');
+
+        headers.set('fOO', 'bat');
+        expect(headers.get('foo')).toEqual('bat');
       });
 
+      it('should preserve the case of the first call', () => {
+        const headers = new Headers();
+        headers.set('fOo', 'baz');
+        headers.set('foo', 'bat');
+        expect(JSON.stringify(headers)).toEqual('{"fOo":["bat"]}');
+      });
 
       it('should convert input array to string', () => {
-        var headers = new Headers();
-        var inputArr = ['bar', 'baz'];
-        headers.set('foo', inputArr);
-        expect(/bar, ?baz/g.test(headers.get('foo'))).toBe(true);
-        expect(/bar, ?baz/g.test(headers.getAll('foo')[0])).toBe(true);
+        const headers = new Headers();
+        headers.set('foo', ['bar', 'baz']);
+        expect(headers.get('foo')).toEqual('bar,baz');
+        expect(headers.getAll('foo')).toEqual(['bar,baz']);
       });
     });
 
+    describe('.get()', () => {
+      it('should be case insensitive', () => {
+        const headers = new Headers();
+        headers.set('foo', 'baz');
+        expect(headers.get('foo')).toEqual('baz');
+        expect(headers.get('FOO')).toEqual('baz');
+      });
 
-    describe('.toJSON()', () => {
-      let headers: any /** TODO #9100 */ = null;
-      let inputArr: any /** TODO #9100 */ = null;
-      let obj: any /** TODO #9100 */ = null;
+      it('should return null if the header is not present', () => {
+        const headers = new Headers({bar: []});
+        expect(headers.get('bar')).toEqual(null);
+        expect(headers.get('foo')).toEqual(null);
+      });
+    });
 
-      beforeEach(() => {
-        headers = new Headers();
-        inputArr = ['application/jeisen', 'application/jason', 'application/patrickjs'];
-        obj = {'accept': inputArr};
-        headers.set('Accept', inputArr);
+    describe('.getAll()', () => {
+      it('should be case insensitive', () => {
+        const headers = new Headers({foo: ['bar', 'baz']});
+        expect(headers.getAll('foo')).toEqual(['bar', 'baz']);
+        expect(headers.getAll('FOO')).toEqual(['bar', 'baz']);
       });
 
+      it('should return null if the header is not present', () => {
+        const headers = new Headers();
+        expect(headers.getAll('foo')).toEqual(null);
+      });
+    });
 
-      it('should be serializable with toJSON', () => {
-        let stringifed = Json.stringify(obj);
-        let serializedHeaders = Json.stringify(headers);
-        expect(serializedHeaders).toEqual(stringifed);
+    describe('.delete', () => {
+      it('should be case insensitive', () => {
+        const headers = new Headers();
+
+        headers.set('foo', 'baz');
+        expect(headers.has('foo')).toEqual(true);
+        headers.delete('foo');
+        expect(headers.has('foo')).toEqual(false);
+
+        headers.set('foo', 'baz');
+        expect(headers.has('foo')).toEqual(true);
+        headers.delete('FOO');
+        expect(headers.has('foo')).toEqual(false);
       });
+    });
 
+    describe('.append', () => {
+      it('should preserve the case of the first call', () => {
+        const headers = new Headers();
 
-      it('should be able to parse serialized header', () => {
-        let stringifed = Json.stringify(obj);
-        let serializedHeaders = Json.stringify(headers);
-        expect(Json.parse(serializedHeaders)).toEqual(Json.parse(stringifed));
+        headers.append('FOO', 'bar');
+        headers.append('foo', 'baz');
+        expect(JSON.stringify(headers)).toEqual('{"FOO":["bar","baz"]}');
       });
+    });
 
+    describe('.toJSON()', () => {
+      let headers: Headers;
+      let values: string[];
+      let ref: {[name: string]: string[]};
+
+      beforeEach(() => {
+        values = ['application/jeisen', 'application/jason', 'application/patrickjs'];
+        headers = new Headers();
+        headers.set('Accept', values);
+        ref = {'Accept': values};
+      });
+
+
+      it('should be serializable with toJSON',
+         () => { expect(JSON.stringify(headers)).toEqual(JSON.stringify(ref)); });
 
       it('should be able to recreate serializedHeaders', () => {
-        let serializedHeaders = Json.stringify(headers);
-        let parsedHeaders = Json.parse(serializedHeaders);
-        let recreatedHeaders = new Headers(parsedHeaders);
-        expect(Json.stringify(parsedHeaders)).toEqual(Json.stringify(recreatedHeaders));
+        const parsedHeaders = JSON.parse(JSON.stringify(headers));
+        const recreatedHeaders = new Headers(parsedHeaders);
+        expect(JSON.stringify(parsedHeaders)).toEqual(JSON.stringify(recreatedHeaders));
       });
     });
   });
@@ -110,19 +148,15 @@ export function main() {
   describe('.fromResponseHeaderString()', () => {
 
     it('should parse a response header string', () => {
-
-      let responseHeaderString = `Date: Fri, 20 Nov 2015 01:45:26 GMT
-Content-Type: application/json; charset=utf-8
-Transfer-Encoding: chunked
-Connection: keep-alive`;
-
-      let responseHeaders = Headers.fromResponseHeaderString(responseHeaderString);
-
-      expect(responseHeaders.get('Date')).toEqual('Fri, 20 Nov 2015 01:45:26 GMT');
-      expect(responseHeaders.get('Content-Type')).toEqual('application/json; charset=utf-8');
-      expect(responseHeaders.get('Transfer-Encoding')).toEqual('chunked');
-      expect(responseHeaders.get('Connection')).toEqual('keep-alive');
-
+      const response = `Date: Fri, 20 Nov 2015 01:45:26 GMT\n` +
+          `Content-Type: application/json; charset=utf-8\n` +
+          `Transfer-Encoding: chunked\n` +
+          `Connection: keep-alive`;
+      const headers = Headers.fromResponseHeaderString(response);
+      expect(headers.get('Date')).toEqual('Fri, 20 Nov 2015 01:45:26 GMT');
+      expect(headers.get('Content-Type')).toEqual('application/json; charset=utf-8');
+      expect(headers.get('Transfer-Encoding')).toEqual('chunked');
+      expect(headers.get('Connection')).toEqual('keep-alive');
     });
   });
 }
diff --git a/tools/public_api_guard/http/index.d.ts b/tools/public_api_guard/http/index.d.ts
index bc45296ac138..568a34d9c894 100644
--- a/tools/public_api_guard/http/index.d.ts
+++ b/tools/public_api_guard/http/index.d.ts
@@ -35,19 +35,19 @@ export declare class CookieXSRFStrategy implements XSRFStrategy {
 /** @experimental */
 export declare class Headers {
     constructor(headers?: Headers | {
-        [key: string]: any;
+        [name: string]: any;
     });
     append(name: string, value: string): void;
     delete(name: string): void;
     entries(): void;
     forEach(fn: (values: string[], name: string, headers: Map<string, string[]>) => void): void;
-    get(header: string): string;
-    getAll(header: string): string[];
-    has(header: string): boolean;
+    get(name: string): string;
+    getAll(name: string): string[];
+    has(name: string): boolean;
     keys(): string[];
-    set(header: string, value: string | string[]): void;
+    set(name: string, value: string | string[]): void;
     toJSON(): {
-        [key: string]: any;
+        [name: string]: any;
     };
     values(): string[][];
     static fromResponseHeaderString(headersString: string): Headers;

From 1bd8ba80a71f0258fdc6ec6ea297741b85c47953 Mon Sep 17 00:00:00 2001
From: Alex Eagle <eagle@post.harvard.edu>
Date: Mon, 3 Oct 2016 16:46:05 -0700
Subject: [PATCH 62/70] refactor(facade): Remove most of StringMapWrapper
 facade. (#12022)

This change mostly automated by
https://github.com/alexeagle/tslint/commit/12012b07a2f7c341424aee5b40660ca0839bc347
with some manual fixes.
---
 .../benchpress/src/metric/multi_metric.ts     |  4 +-
 .../benchpress/src/metric/user_metric.ts      |  3 +-
 .../@angular/benchpress/src/reporter/util.ts  |  6 +-
 .../benchpress/src/sample_description.ts      |  3 +-
 .../test/metric/perflog_metric_spec.ts        |  3 +-
 .../compiler-cli/test/reflector_host_spec.ts  |  2 +-
 .../test/static_reflector_spec.ts             |  1 -
 .../src/animation/animation_compiler.ts       | 34 ++++----
 .../src/animation/animation_parser.ts         | 82 ++++++++-----------
 .../@angular/compiler/src/compile_metadata.ts |  5 +-
 .../compiler/src/output/value_util.ts         |  5 +-
 .../src/template_parser/template_parser.ts    | 13 +--
 modules/@angular/compiler/src/util.ts         |  6 +-
 .../src/view_compiler/compile_element.ts      |  4 +-
 .../src/view_compiler/event_binder.ts         | 14 ++--
 .../src/view_compiler/view_builder.ts         | 22 +++--
 .../test/animation/animation_parser_spec.ts   |  6 +-
 .../src/animation/animation_style_util.ts     | 23 +++---
 .../core/src/animation/view_animation_map.ts  |  6 +-
 .../differs/default_keyvalue_differ.ts        |  2 +-
 .../@angular/core/src/linker/debug_context.ts |  4 +-
 .../@angular/core/src/reflection/reflector.ts |  4 +-
 .../change_detection_integration_spec.ts      |  3 +-
 .../@angular/core/testing/testing_internal.ts |  4 +-
 modules/@angular/facade/src/collection.ts     | 28 +------
 modules/@angular/forms/src/form_builder.ts    |  5 +-
 modules/@angular/forms/src/model.ts           | 10 +--
 modules/@angular/forms/src/validators.ts      |  2 +-
 .../src/dom/web_animations_driver.ts          |  9 +-
 .../src/dom/web_animations_player.ts          |  5 +-
 .../test/dom/web_animations_driver_spec.ts    |  3 +-
 .../platform-browser/testing/matchers.ts      |  8 +-
 .../testing/mock_animation_driver.ts          |  4 +-
 .../platform-server/src/parse5_adapter.ts     |  4 +-
 modules/benchmarks/src/tree/ng2_ftl/index.ts  |  4 +-
 .../src/tree/ng2_static_ftl/index.ts          |  4 +-
 36 files changed, 140 insertions(+), 205 deletions(-)

diff --git a/modules/@angular/benchpress/src/metric/multi_metric.ts b/modules/@angular/benchpress/src/metric/multi_metric.ts
index 09b4668836a4..1a92a3320023 100644
--- a/modules/@angular/benchpress/src/metric/multi_metric.ts
+++ b/modules/@angular/benchpress/src/metric/multi_metric.ts
@@ -7,7 +7,6 @@
  */
 
 import {Injector, OpaqueToken} from '@angular/core';
-import {StringMapWrapper} from '../facade/collection';
 
 import {Metric} from '../metric';
 
@@ -57,8 +56,7 @@ export class MultiMetric extends Metric {
 
 function mergeStringMaps(maps: {[key: string]: string}[]): {[key: string]: string} {
   var result: {[key: string]: string} = {};
-  maps.forEach(
-      map => { StringMapWrapper.forEach(map, (value, prop) => { result[prop] = value; }); });
+  maps.forEach(map => { Object.keys(map).forEach(prop => { result[prop] = map[prop]; }); });
   return result;
 }
 
diff --git a/modules/@angular/benchpress/src/metric/user_metric.ts b/modules/@angular/benchpress/src/metric/user_metric.ts
index e5828a1ebbf9..e1c221df268e 100644
--- a/modules/@angular/benchpress/src/metric/user_metric.ts
+++ b/modules/@angular/benchpress/src/metric/user_metric.ts
@@ -9,7 +9,6 @@
 import {Inject, Injectable} from '@angular/core';
 
 import {Options} from '../common_options';
-import {StringMapWrapper} from '../facade/collection';
 import {isNumber} from '../facade/lang';
 import {Metric} from '../metric';
 import {WebDriverAdapter} from '../web_driver_adapter';
@@ -40,7 +39,7 @@ export class UserMetric extends Metric {
       reject = rej;
     });
     let adapter = this._wdAdapter;
-    let names = StringMapWrapper.keys(this._userMetrics);
+    let names = Object.keys(this._userMetrics);
 
     function getAndClearValues() {
       Promise.all(names.map(name => adapter.executeScript(`return window.${name}`)))
diff --git a/modules/@angular/benchpress/src/reporter/util.ts b/modules/@angular/benchpress/src/reporter/util.ts
index afe417c5ba57..d04371cc1ca6 100644
--- a/modules/@angular/benchpress/src/reporter/util.ts
+++ b/modules/@angular/benchpress/src/reporter/util.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {StringMapWrapper} from '../facade/collection';
+
 import {NumberWrapper} from '../facade/lang';
 import {MeasureValues} from '../measure_values';
 import {Statistic} from '../statistic';
@@ -17,7 +17,7 @@ export function formatNum(n: number) {
 
 export function sortedProps(obj: {[key: string]: any}) {
   var props: string[] = [];
-  StringMapWrapper.forEach(obj, (value, prop) => props.push(prop));
+  props.push(...Object.keys(obj));
   props.sort();
   return props;
 }
@@ -30,4 +30,4 @@ export function formatStats(validSamples: MeasureValues[], metricName: string):
   // Note: Don't use the unicode character for +- as it might cause
   // hickups for consoles...
   return NumberWrapper.isNaN(cv) ? formattedMean : `${formattedMean}+-${Math.floor(cv)}%`;
-}
\ No newline at end of file
+}
diff --git a/modules/@angular/benchpress/src/sample_description.ts b/modules/@angular/benchpress/src/sample_description.ts
index 3cf5a99a3f41..a82e5e1b5eaa 100644
--- a/modules/@angular/benchpress/src/sample_description.ts
+++ b/modules/@angular/benchpress/src/sample_description.ts
@@ -9,7 +9,6 @@
 import {OpaqueToken} from '@angular/core';
 
 import {Options} from './common_options';
-import {StringMapWrapper} from './facade/collection';
 import {Metric} from './metric';
 import {Validator} from './validator';
 
@@ -42,7 +41,7 @@ export class SampleDescription {
       public metrics: {[key: string]: any}) {
     this.description = {};
     descriptions.forEach(description => {
-      StringMapWrapper.forEach(description, (value, prop) => this.description[prop] = value);
+      Object.keys(description).forEach(prop => { this.description[prop] = description[prop]; });
     });
   }
 
diff --git a/modules/@angular/benchpress/test/metric/perflog_metric_spec.ts b/modules/@angular/benchpress/test/metric/perflog_metric_spec.ts
index eab81efd8b96..bf933e1ad880 100644
--- a/modules/@angular/benchpress/test/metric/perflog_metric_spec.ts
+++ b/modules/@angular/benchpress/test/metric/perflog_metric_spec.ts
@@ -10,7 +10,6 @@ import {Provider} from '@angular/core';
 import {AsyncTestCompleter, beforeEach, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
 
 import {Metric, Options, PerfLogEvent, PerfLogFeatures, PerflogMetric, ReflectiveInjector, WebDriverExtension} from '../../index';
-import {StringMapWrapper} from '../../src/facade/collection';
 import {isPresent} from '../../src/facade/lang';
 import {TraceEventFactory} from '../trace_event_factory';
 
@@ -68,7 +67,7 @@ export function main() {
 
     function sortedKeys(stringMap: {[key: string]: any}) {
       var res: string[] = [];
-      StringMapWrapper.forEach(stringMap, (_, key) => { res.push(key); });
+      res.push(...Object.keys(stringMap));
       res.sort();
       return res;
     }
diff --git a/modules/@angular/compiler-cli/test/reflector_host_spec.ts b/modules/@angular/compiler-cli/test/reflector_host_spec.ts
index c37284bff31f..a0dc2c3e8d08 100644
--- a/modules/@angular/compiler-cli/test/reflector_host_spec.ts
+++ b/modules/@angular/compiler-cli/test/reflector_host_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {beforeEach, ddescribe, describe, expect, iit, it} from '@angular/core/testing/testing_internal';
+import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal';
 import * as ts from 'typescript';
 
 import {ReflectorHost} from '../src/reflector_host';
diff --git a/modules/@angular/compiler-cli/test/static_reflector_spec.ts b/modules/@angular/compiler-cli/test/static_reflector_spec.ts
index 75f8c823f8ee..feb2d553eeb6 100644
--- a/modules/@angular/compiler-cli/test/static_reflector_spec.ts
+++ b/modules/@angular/compiler-cli/test/static_reflector_spec.ts
@@ -9,7 +9,6 @@
 import {StaticReflector, StaticReflectorHost, StaticSymbol} from '@angular/compiler-cli/src/static_reflector';
 import {HostListener, animate, group, keyframes, sequence, state, style, transition, trigger} from '@angular/core';
 import {ListWrapper} from '@angular/facade/src/collection';
-import {isBlank} from '@angular/facade/src/lang';
 import {MetadataCollector} from '@angular/tsc-wrapped';
 import * as ts from 'typescript';
 
diff --git a/modules/@angular/compiler/src/animation/animation_compiler.ts b/modules/@angular/compiler/src/animation/animation_compiler.ts
index 0622068c1849..edb53987011b 100644
--- a/modules/@angular/compiler/src/animation/animation_compiler.ts
+++ b/modules/@angular/compiler/src/animation/animation_compiler.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {StringMapWrapper} from '../facade/collection';
+
 import {isPresent} from '../facade/lang';
 import {Identifiers, resolveIdentifier} from '../identifiers';
 import * as o from '../output/output_ast';
@@ -61,8 +61,7 @@ class _AnimationBuilder implements AnimationAstVisitor {
     }
 
     ast.styles.forEach(entry => {
-      stylesArr.push(
-          o.literalMap(StringMapWrapper.keys(entry).map(key => [key, o.literal(entry[key])])));
+      stylesArr.push(o.literalMap(Object.keys(entry).map(key => [key, o.literal(entry[key])])));
     });
 
     return o.importExpr(resolveIdentifier(Identifiers.AnimationStyles)).instantiate([
@@ -133,9 +132,8 @@ class _AnimationBuilder implements AnimationAstVisitor {
   visitAnimationStateDeclaration(
       ast: AnimationStateDeclarationAst, context: _AnimationBuilderContext): void {
     var flatStyles: {[key: string]: string | number} = {};
-    _getStylesArray(ast).forEach(entry => {
-      StringMapWrapper.forEach(entry, (value: string, key: string) => { flatStyles[key] = value; });
-    });
+    _getStylesArray(ast).forEach(
+        entry => { Object.keys(entry).forEach(key => { flatStyles[key] = entry[key]; }); });
     context.stateMap.registerState(ast.stateName, flatStyles);
   }
 
@@ -291,18 +289,16 @@ class _AnimationBuilder implements AnimationAstVisitor {
     var fnVariable = o.variable(this._fnVarName);
 
     var lookupMap: any[] = [];
-    StringMapWrapper.forEach(
-        context.stateMap.states, (value: {[key: string]: string}, stateName: string) => {
-          var variableValue = EMPTY_MAP;
-          if (isPresent(value)) {
-            let styleMap: any[] = [];
-            StringMapWrapper.forEach(value, (value: string, key: string) => {
-              styleMap.push([key, o.literal(value)]);
-            });
-            variableValue = o.literalMap(styleMap);
-          }
-          lookupMap.push([stateName, variableValue]);
-        });
+    Object.keys(context.stateMap.states).forEach(stateName => {
+      const value = context.stateMap.states[stateName];
+      var variableValue = EMPTY_MAP;
+      if (isPresent(value)) {
+        let styleMap: any[] = [];
+        Object.keys(value).forEach(key => { styleMap.push([key, o.literal(value[key])]); });
+        variableValue = o.literalMap(styleMap);
+      }
+      lookupMap.push([stateName, variableValue]);
+    });
 
     const compiledStatesMapStmt = this._statesMapVar.set(o.literalMap(lookupMap)).toDeclStmt();
     const statements: o.Statement[] = [compiledStatesMapStmt, fnStatement];
@@ -349,7 +345,7 @@ function _isEndStateAnimateStep(step: AnimationAst): boolean {
   if (step instanceof AnimationStepAst && step.duration > 0 && step.keyframes.length == 2) {
     var styles1 = _getStylesArray(step.keyframes[0])[0];
     var styles2 = _getStylesArray(step.keyframes[1])[0];
-    return StringMapWrapper.isEmpty(styles1) && StringMapWrapper.isEmpty(styles2);
+    return Object.keys(styles1).length === 0 && Object.keys(styles2).length === 0;
   }
   return false;
 }
diff --git a/modules/@angular/compiler/src/animation/animation_parser.ts b/modules/@angular/compiler/src/animation/animation_parser.ts
index bf5b7177e3b6..d30456fcdbcb 100644
--- a/modules/@angular/compiler/src/animation/animation_parser.ts
+++ b/modules/@angular/compiler/src/animation/animation_parser.ts
@@ -20,6 +20,10 @@ const _INITIAL_KEYFRAME = 0;
 const _TERMINAL_KEYFRAME = 1;
 const _ONE_SECOND = 1000;
 
+declare type Styles = {
+  [key: string]: string | number
+};
+
 export class AnimationParseError extends ParseError {
   constructor(message: string) { super(null, message); }
   toString(): string { return `${this.msg}`; }
@@ -90,11 +94,11 @@ export class AnimationParser {
 function _parseAnimationDeclarationStates(
     stateMetadata: CompileAnimationStateDeclarationMetadata,
     errors: AnimationParseError[]): AnimationStateDeclarationAst[] {
-  var styleValues: {[key: string]: string | number}[] = [];
+  var styleValues: Styles[] = [];
   stateMetadata.styles.styles.forEach(stylesEntry => {
     // TODO (matsko): change this when we get CSS class integration support
     if (isStringMap(stylesEntry)) {
-      styleValues.push(<{[key: string]: string | number}>stylesEntry);
+      styleValues.push(stylesEntry as Styles);
     } else {
       errors.push(new AnimationParseError(
           `State based animations cannot contain references to other states`));
@@ -153,16 +157,6 @@ function _parseAnimationTransitionExpr(
   return expressions;
 }
 
-function _fetchSylesFromState(stateName: string, stateStyles: {[key: string]: AnimationStylesAst}):
-    CompileAnimationStyleMetadata {
-  var entry = stateStyles[stateName];
-  if (isPresent(entry)) {
-    var styles = <{[key: string]: string | number}[]>entry.styles;
-    return new CompileAnimationStyleMetadata(0, styles);
-  }
-  return null;
-}
-
 function _normalizeAnimationEntry(entry: CompileAnimationMetadata | CompileAnimationMetadata[]):
     CompileAnimationMetadata {
   return isArray(entry) ? new CompileAnimationSequenceMetadata(<CompileAnimationMetadata[]>entry) :
@@ -218,7 +212,7 @@ function _normalizeStyleStepEntry(
   }
 
   var newSteps: CompileAnimationMetadata[] = [];
-  var combinedStyles: {[key: string]: string | number}[];
+  var combinedStyles: Styles[];
   steps.forEach(step => {
     if (step instanceof CompileAnimationStyleMetadata) {
       // this occurs when a style step is followed by a previous style step
@@ -274,7 +268,7 @@ function _normalizeStyleStepEntry(
 function _resolveStylesFromState(
     stateName: string, stateStyles: {[key: string]: AnimationStylesAst},
     errors: AnimationParseError[]) {
-  var styles: {[key: string]: string | number}[] = [];
+  var styles: Styles[] = [];
   if (stateName[0] != ':') {
     errors.push(new AnimationParseError(`Animation states via styles must be prefixed with a ":"`));
   } else {
@@ -286,7 +280,7 @@ function _resolveStylesFromState(
     } else {
       value.styles.forEach(stylesEntry => {
         if (isStringMap(stylesEntry)) {
-          styles.push(<{[key: string]: string | number}>stylesEntry);
+          styles.push(stylesEntry as Styles);
         }
       });
     }
@@ -320,15 +314,13 @@ function _parseAnimationKeyframes(
   var lastOffset = 0;
   keyframeSequence.steps.forEach(styleMetadata => {
     var offset = styleMetadata.offset;
-    var keyframeStyles: {[key: string]: string | number} = {};
+    var keyframeStyles: Styles = {};
     styleMetadata.styles.forEach(entry => {
-      StringMapWrapper.forEach(
-          <{[key: string]: string | number}>entry,
-          (value: any /** TODO #9100 */, prop: any /** TODO #9100 */) => {
-            if (prop != 'offset') {
-              keyframeStyles[prop] = value;
-            }
-          });
+      Object.keys(entry).forEach(prop => {
+        if (prop != 'offset') {
+          keyframeStyles[prop] = (entry as Styles)[prop];
+        }
+      });
     });
 
     if (isPresent(offset)) {
@@ -365,24 +357,22 @@ function _parseAnimationKeyframes(
     let entry = rawKeyframes[i];
     let styles = entry[1];
 
-    StringMapWrapper.forEach(
-        styles, (value: any /** TODO #9100 */, prop: any /** TODO #9100 */) => {
-          if (!isPresent(firstKeyframeStyles[prop])) {
-            firstKeyframeStyles[prop] = FILL_STYLE_FLAG;
-          }
-        });
+    Object.keys(styles).forEach(prop => {
+      if (!isPresent(firstKeyframeStyles[prop])) {
+        firstKeyframeStyles[prop] = FILL_STYLE_FLAG;
+      }
+    });
   }
 
   for (i = limit - 1; i >= 0; i--) {
     let entry = rawKeyframes[i];
     let styles = entry[1];
 
-    StringMapWrapper.forEach(
-        styles, (value: any /** TODO #9100 */, prop: any /** TODO #9100 */) => {
-          if (!isPresent(lastKeyframeStyles[prop])) {
-            lastKeyframeStyles[prop] = value;
-          }
-        });
+    Object.keys(styles).forEach(prop => {
+      if (!isPresent(lastKeyframeStyles[prop])) {
+        lastKeyframeStyles[prop] = styles[prop];
+      }
+    });
   }
 
   return rawKeyframes.map(
@@ -406,11 +396,9 @@ function _parseTransitionAnimation(
       if (entry instanceof CompileAnimationStyleMetadata) {
         entry.styles.forEach(stylesEntry => {
           // by this point we know that we only have stringmap values
-          var map = <{[key: string]: string | number}>stylesEntry;
-          StringMapWrapper.forEach(
-              map, (value: any /** TODO #9100 */, prop: any /** TODO #9100 */) => {
-                collectedStyles.insertAtTime(prop, time, value);
-              });
+          var map = stylesEntry as Styles;
+          Object.keys(map).forEach(
+              prop => { collectedStyles.insertAtTime(prop, time, map[prop]); });
         });
         previousStyles = entry.styles;
         return;
@@ -456,7 +444,7 @@ function _parseTransitionAnimation(
     } else {
       let styleData = <CompileAnimationStyleMetadata>styles;
       let offset = _TERMINAL_KEYFRAME;
-      let styleAst = new AnimationStylesAst(<{[key: string]: string | number}[]>styleData.styles);
+      let styleAst = new AnimationStylesAst(styleData.styles as Styles[]);
       var keyframe = new AnimationKeyframeAst(offset, styleAst);
       keyframes = [keyframe];
     }
@@ -468,9 +456,8 @@ function _parseTransitionAnimation(
 
     keyframes.forEach(
         (keyframe: any /** TODO #9100 */) => keyframe.styles.styles.forEach(
-            (entry: any /** TODO #9100 */) => StringMapWrapper.forEach(
-                entry, (value: any /** TODO #9100 */, prop: any /** TODO #9100 */) =>
-                           collectedStyles.insertAtTime(prop, currentTime, value))));
+            (entry: any /** TODO #9100 */) => Object.keys(entry).forEach(
+                prop => { collectedStyles.insertAtTime(prop, currentTime, entry[prop]); })));
   } else {
     // if the code reaches this stage then an error
     // has already been populated within the _normalizeStyleSteps()
@@ -543,10 +530,11 @@ function _parseTimeExpression(
 function _createStartKeyframeFromEndKeyframe(
     endKeyframe: AnimationKeyframeAst, startTime: number, duration: number,
     collectedStyles: StylesCollection, errors: AnimationParseError[]): AnimationKeyframeAst {
-  var values: {[key: string]: string | number} = {};
+  var values: Styles = {};
   var endTime = startTime + duration;
-  endKeyframe.styles.styles.forEach((styleData: {[key: string]: string | number}) => {
-    StringMapWrapper.forEach(styleData, (val: any /** TODO #9100 */, prop: any /** TODO #9100 */) => {
+  endKeyframe.styles.styles.forEach((styleData: Styles) => {
+    Object.keys(styleData).forEach(prop => {
+      const val = styleData[prop];
       if (prop == 'offset') return;
 
       var resultIndex = collectedStyles.indexOfAtOrBeforeTime(prop, startTime);
diff --git a/modules/@angular/compiler/src/compile_metadata.ts b/modules/@angular/compiler/src/compile_metadata.ts
index 94db25d41840..a067044c6330 100644
--- a/modules/@angular/compiler/src/compile_metadata.ts
+++ b/modules/@angular/compiler/src/compile_metadata.ts
@@ -8,7 +8,7 @@
 
 import {ChangeDetectionStrategy, SchemaMetadata, Type, ViewEncapsulation} from '@angular/core';
 
-import {ListWrapper, MapWrapper, StringMapWrapper} from './facade/collection';
+import {ListWrapper, MapWrapper} from './facade/collection';
 import {isPresent, isStringMap, normalizeBlank, normalizeBool} from './facade/lang';
 import {LifecycleHooks} from './private_import_core';
 import {CssSelector} from './selector';
@@ -342,7 +342,8 @@ export class CompileDirectiveMetadata implements CompileMetadataWithIdentifier {
     var hostProperties: {[key: string]: string} = {};
     var hostAttributes: {[key: string]: string} = {};
     if (isPresent(host)) {
-      StringMapWrapper.forEach(host, (value: string, key: string) => {
+      Object.keys(host).forEach(key => {
+        const value = host[key];
         const matches = key.match(HOST_REG_EXP);
         if (matches === null) {
           hostAttributes[key] = value;
diff --git a/modules/@angular/compiler/src/output/value_util.ts b/modules/@angular/compiler/src/output/value_util.ts
index 9b0df14bc032..37ac5756ec2d 100644
--- a/modules/@angular/compiler/src/output/value_util.ts
+++ b/modules/@angular/compiler/src/output/value_util.ts
@@ -8,7 +8,6 @@
 
 
 import {CompileIdentifierMetadata} from '../compile_metadata';
-import {StringMapWrapper} from '../facade/collection';
 import {ValueTransformer, visitValue} from '../util';
 
 import * as o from './output_ast';
@@ -24,9 +23,7 @@ class _ValueOutputAstTransformer implements ValueTransformer {
 
   visitStringMap(map: {[key: string]: any}, type: o.MapType): o.Expression {
     var entries: Array<string|o.Expression>[] = [];
-    StringMapWrapper.forEach(map, (value: any, key: string) => {
-      entries.push([key, visitValue(value, this, null)]);
-    });
+    Object.keys(map).forEach(key => { entries.push([key, visitValue(map[key], this, null)]); });
     return o.literalMap(entries, type);
   }
 
diff --git a/modules/@angular/compiler/src/template_parser/template_parser.ts b/modules/@angular/compiler/src/template_parser/template_parser.ts
index 5710605bd651..0f884f25e53c 100644
--- a/modules/@angular/compiler/src/template_parser/template_parser.ts
+++ b/modules/@angular/compiler/src/template_parser/template_parser.ts
@@ -11,7 +11,6 @@ import {Inject, Injectable, OpaqueToken, Optional, SchemaMetadata, SecurityConte
 import {CompileDirectiveMetadata, CompilePipeMetadata, CompileTemplateMetadata, CompileTokenMetadata, removeIdentifierDuplicates} from '../compile_metadata';
 import {AST, ASTWithSource, BindingPipe, EmptyExpr, Interpolation, ParserError, RecursiveAstVisitor, TemplateBinding} from '../expression_parser/ast';
 import {Parser} from '../expression_parser/parser';
-import {StringMapWrapper} from '../facade/collection';
 import {isPresent, isString} from '../facade/lang';
 import {I18NHtmlParser} from '../i18n/i18n_html_parser';
 import {Identifiers, identifierToken, resolveIdentifierToken} from '../identifiers';
@@ -832,7 +831,8 @@ class TemplateParseVisitor implements html.Visitor {
       elementName: string, hostProps: {[key: string]: string}, sourceSpan: ParseSourceSpan,
       targetPropertyAsts: BoundElementPropertyAst[]) {
     if (hostProps) {
-      StringMapWrapper.forEach(hostProps, (expression: string, propName: string) => {
+      Object.keys(hostProps).forEach(propName => {
+        const expression = hostProps[propName];
         if (isString(expression)) {
           const exprAst = this._parseBinding(expression, sourceSpan);
           targetPropertyAsts.push(
@@ -850,7 +850,8 @@ class TemplateParseVisitor implements html.Visitor {
       hostListeners: {[key: string]: string}, sourceSpan: ParseSourceSpan,
       targetEventAsts: BoundEventAst[]) {
     if (hostListeners) {
-      StringMapWrapper.forEach(hostListeners, (expression: string, propName: string) => {
+      Object.keys(hostListeners).forEach(propName => {
+        const expression = hostListeners[propName];
         if (isString(expression)) {
           this._parseEventOrAnimationEvent(propName, expression, sourceSpan, [], targetEventAsts);
         } else {
@@ -875,7 +876,8 @@ class TemplateParseVisitor implements html.Visitor {
         }
       });
 
-      StringMapWrapper.forEach(directiveProperties, (elProp: string, dirProp: string) => {
+      Object.keys(directiveProperties).forEach(dirProp => {
+        const elProp = directiveProperties[dirProp];
         const boundProp = boundPropsByName.get(elProp);
 
         // Bindings are optional, so this binding only needs to be set up if an expression is given.
@@ -1047,7 +1049,8 @@ class TemplateParseVisitor implements html.Visitor {
     const allDirectiveEvents = new Set<string>();
 
     directives.forEach(directive => {
-      StringMapWrapper.forEach(directive.directive.outputs, (eventName: string) => {
+      Object.keys(directive.directive.outputs).forEach(k => {
+        const eventName = directive.directive.outputs[k];
         allDirectiveEvents.add(eventName);
       });
     });
diff --git a/modules/@angular/compiler/src/util.ts b/modules/@angular/compiler/src/util.ts
index f69eb0c63c26..512c897566d2 100644
--- a/modules/@angular/compiler/src/util.ts
+++ b/modules/@angular/compiler/src/util.ts
@@ -7,7 +7,6 @@
  */
 
 import {CompileTokenMetadata} from './compile_metadata';
-import {StringMapWrapper} from './facade/collection';
 import {StringWrapper, isArray, isBlank, isPresent, isPrimitive, isStrictStringMap} from './facade/lang';
 import * as o from './output/output_ast';
 
@@ -63,9 +62,8 @@ export class ValueTransformer implements ValueVisitor {
   }
   visitStringMap(map: {[key: string]: any}, context: any): any {
     var result = {};
-    StringMapWrapper.forEach(map, (value: any /** TODO #9100 */, key: any /** TODO #9100 */) => {
-      (result as any /** TODO #9100 */)[key] = visitValue(value, this, context);
-    });
+    Object.keys(map).forEach(
+        key => { (result as any /** TODO #9100 */)[key] = visitValue(map[key], this, context); });
     return result;
   }
   visitPrimitive(value: any, context: any): any { return value; }
diff --git a/modules/@angular/compiler/src/view_compiler/compile_element.ts b/modules/@angular/compiler/src/view_compiler/compile_element.ts
index 575929a78902..8986330e89f3 100644
--- a/modules/@angular/compiler/src/view_compiler/compile_element.ts
+++ b/modules/@angular/compiler/src/view_compiler/compile_element.ts
@@ -8,7 +8,7 @@
 
 
 import {CompileDiDependencyMetadata, CompileDirectiveMetadata, CompileIdentifierMetadata, CompileProviderMetadata, CompileQueryMetadata, CompileTokenMetadata} from '../compile_metadata';
-import {ListWrapper, MapWrapper, StringMapWrapper} from '../facade/collection';
+import {ListWrapper, MapWrapper} from '../facade/collection';
 import {isPresent} from '../facade/lang';
 import {Identifiers, identifierToken, resolveIdentifier, resolveIdentifierToken} from '../identifiers';
 import * as o from '../output/output_ast';
@@ -192,7 +192,7 @@ export class CompileElement extends CompileNode {
           queriesWithReads,
           queriesForProvider.map(query => new _QueryWithRead(query, resolvedProvider.token)));
     });
-    StringMapWrapper.forEach(this.referenceTokens, (_: CompileTokenMetadata, varName: string) => {
+    Object.keys(this.referenceTokens).forEach(varName => {
       var token = this.referenceTokens[varName];
       var varValue: o.Expression;
       if (isPresent(token)) {
diff --git a/modules/@angular/compiler/src/view_compiler/event_binder.ts b/modules/@angular/compiler/src/view_compiler/event_binder.ts
index 9673640f906c..504923a7dff1 100644
--- a/modules/@angular/compiler/src/view_compiler/event_binder.ts
+++ b/modules/@angular/compiler/src/view_compiler/event_binder.ts
@@ -7,7 +7,6 @@
  */
 
 import {CompileDirectiveMetadata} from '../compile_metadata';
-import {StringMapWrapper} from '../facade/collection';
 import {StringWrapper, isPresent} from '../facade/lang';
 import {identifierToken} from '../identifiers';
 import * as o from '../output/output_ast';
@@ -173,13 +172,12 @@ export function collectEventListeners(
 export function bindDirectiveOutputs(
     directiveAst: DirectiveAst, directiveInstance: o.Expression,
     eventListeners: CompileEventListener[]) {
-  StringMapWrapper.forEach(
-      directiveAst.directive.outputs,
-      (eventName: any /** TODO #9100 */, observablePropName: any /** TODO #9100 */) => {
-        eventListeners.filter(listener => listener.eventName == eventName).forEach((listener) => {
-          listener.listenToDirective(directiveInstance, observablePropName);
-        });
-      });
+  Object.keys(directiveAst.directive.outputs).forEach(observablePropName => {
+    const eventName = directiveAst.directive.outputs[observablePropName];
+    eventListeners.filter(listener => listener.eventName == eventName).forEach((listener) => {
+      listener.listenToDirective(directiveInstance, observablePropName);
+    });
+  });
 }
 
 export function bindRenderOutputs(eventListeners: CompileEventListener[]) {
diff --git a/modules/@angular/compiler/src/view_compiler/view_builder.ts b/modules/@angular/compiler/src/view_compiler/view_builder.ts
index 71958bc21c30..4fdb24f7d10d 100644
--- a/modules/@angular/compiler/src/view_compiler/view_builder.ts
+++ b/modules/@angular/compiler/src/view_compiler/view_builder.ts
@@ -9,7 +9,7 @@
 import {ViewEncapsulation} from '@angular/core';
 
 import {CompileDirectiveMetadata, CompileIdentifierMetadata, CompileTokenMetadata} from '../compile_metadata';
-import {ListWrapper, StringMapWrapper} from '../facade/collection';
+import {ListWrapper} from '../facade/collection';
 import {StringWrapper, isPresent} from '../facade/lang';
 import {Identifiers, identifierToken, resolveIdentifier} from '../identifiers';
 import * as o from '../output/output_ast';
@@ -346,10 +346,10 @@ function _mergeHtmlAndDirectiveAttrs(
     declaredHtmlAttrs: {[key: string]: string},
     directives: CompileDirectiveMetadata[]): string[][] {
   var result: {[key: string]: string} = {};
-  StringMapWrapper.forEach(
-      declaredHtmlAttrs, (value: string, key: string) => { result[key] = value; });
+  Object.keys(declaredHtmlAttrs).forEach(key => { result[key] = declaredHtmlAttrs[key]; });
   directives.forEach(directiveMeta => {
-    StringMapWrapper.forEach(directiveMeta.hostAttributes, (value: string, name: string) => {
+    Object.keys(directiveMeta.hostAttributes).forEach(name => {
+      const value = directiveMeta.hostAttributes[name];
       var prevValue = result[name];
       result[name] = isPresent(prevValue) ? mergeAttributeValue(name, prevValue, value) : value;
     });
@@ -373,9 +373,7 @@ function mergeAttributeValue(attrName: string, attrValue1: string, attrValue2: s
 
 function mapToKeyValueArray(data: {[key: string]: string}): string[][] {
   var entryArray: string[][] = [];
-  StringMapWrapper.forEach(data, (value: string, name: string) => {
-    entryArray.push([name, value]);
-  });
+  Object.keys(data).forEach(name => { entryArray.push([name, data[name]]); });
   // We need to sort to get a defined output order
   // for tests and for caching generated artifacts...
   ListWrapper.sort(entryArray, (entry1, entry2) => StringWrapper.compare(entry1[0], entry2[0]));
@@ -421,11 +419,11 @@ function createStaticNodeDebugInfo(node: CompileNode): o.Expression {
     if (isPresent(compileElement.component)) {
       componentToken = createDiTokenExpression(identifierToken(compileElement.component.type));
     }
-    StringMapWrapper.forEach(
-        compileElement.referenceTokens, (token: CompileTokenMetadata, varName: string) => {
-          varTokenEntries.push(
-              [varName, isPresent(token) ? createDiTokenExpression(token) : o.NULL_EXPR]);
-        });
+    Object.keys(compileElement.referenceTokens).forEach(varName => {
+      const token = compileElement.referenceTokens[varName];
+      varTokenEntries.push(
+          [varName, isPresent(token) ? createDiTokenExpression(token) : o.NULL_EXPR]);
+    });
   }
   return o.importExpr(resolveIdentifier(Identifiers.StaticNodeDebugInfo))
       .instantiate(
diff --git a/modules/@angular/compiler/test/animation/animation_parser_spec.ts b/modules/@angular/compiler/test/animation/animation_parser_spec.ts
index 9958eaa0100c..f78005816719 100644
--- a/modules/@angular/compiler/test/animation/animation_parser_spec.ts
+++ b/modules/@angular/compiler/test/animation/animation_parser_spec.ts
@@ -12,7 +12,6 @@ import {expect} from '@angular/platform-browser/testing/matchers';
 
 import {AnimationEntryAst, AnimationGroupAst, AnimationKeyframeAst, AnimationSequenceAst, AnimationStepAst, AnimationStylesAst} from '../../src/animation/animation_ast';
 import {AnimationParser} from '../../src/animation/animation_parser';
-import {StringMapWrapper} from '../../src/facade/collection';
 import {CompileMetadataResolver} from '../../src/metadata_resolver';
 import {FILL_STYLE_FLAG, flattenStyles} from '../private_import_core';
 
@@ -21,10 +20,7 @@ export function main() {
     var combineStyles = (styles: AnimationStylesAst): {[key: string]: string | number} => {
       var flatStyles: {[key: string]: string | number} = {};
       styles.styles.forEach(
-          entry => StringMapWrapper.forEach(
-              entry, (val: any /** TODO #9100 */, prop: any /** TODO #9100 */) => {
-                flatStyles[prop] = val;
-              }));
+          entry => Object.keys(entry).forEach(prop => { flatStyles[prop] = entry[prop]; }));
       return flatStyles;
     };
 
diff --git a/modules/@angular/core/src/animation/animation_style_util.ts b/modules/@angular/core/src/animation/animation_style_util.ts
index 18e4df4240a5..264f321e934b 100644
--- a/modules/@angular/core/src/animation/animation_style_util.ts
+++ b/modules/@angular/core/src/animation/animation_style_util.ts
@@ -17,11 +17,12 @@ export function prepareFinalAnimationStyles(
     nullValue: string = null): {[key: string]: string} {
   var finalStyles: {[key: string]: string} = {};
 
-  StringMapWrapper.forEach(newStyles, (value: string, prop: string) => {
+  Object.keys(newStyles).forEach(prop => {
+    const value = newStyles[prop];
     finalStyles[prop] = value == AUTO_STYLE ? nullValue : value.toString();
   });
 
-  StringMapWrapper.forEach(previousStyles, (value: string, prop: string) => {
+  Object.keys(previousStyles).forEach(prop => {
     if (!isPresent(finalStyles[prop])) {
       finalStyles[prop] = nullValue;
     }
@@ -41,7 +42,8 @@ export function balanceAnimationKeyframes(
 
   var extraFirstKeyframeStyles: {[key: string]: string} = {};
   var hasExtraFirstStyles = false;
-  StringMapWrapper.forEach(collectedStyles, (value: string, prop: string) => {
+  Object.keys(collectedStyles).forEach(prop => {
+    const value = collectedStyles[prop] as string;
     // if the style is already defined in the first keyframe then
     // we do not replace it.
     if (!flatenedFirstKeyframeStyles[prop]) {
@@ -60,7 +62,7 @@ export function balanceAnimationKeyframes(
   var flatenedFinalKeyframeStyles = flattenStyles(finalKeyframe.styles.styles);
   var extraFinalKeyframeStyles: {[key: string]: string} = {};
   var hasExtraFinalStyles = false;
-  StringMapWrapper.forEach(keyframeCollectedStyles, (value: string, prop: string) => {
+  Object.keys(keyframeCollectedStyles).forEach(prop => {
     if (!isPresent(flatenedFinalKeyframeStyles[prop])) {
       extraFinalKeyframeStyles[prop] = AUTO_STYLE;
       hasExtraFinalStyles = true;
@@ -71,7 +73,7 @@ export function balanceAnimationKeyframes(
     finalKeyframe.styles.styles.push(extraFinalKeyframeStyles);
   }
 
-  StringMapWrapper.forEach(flatenedFinalKeyframeStyles, (value: string, prop: string) => {
+  Object.keys(flatenedFinalKeyframeStyles).forEach(prop => {
     if (!isPresent(flatenedFirstKeyframeStyles[prop])) {
       extraFirstKeyframeStyles[prop] = AUTO_STYLE;
       hasExtraFirstStyles = true;
@@ -87,7 +89,7 @@ export function balanceAnimationKeyframes(
 
 export function clearStyles(styles: {[key: string]: string | number}): {[key: string]: string} {
   var finalStyles: {[key: string]: string} = {};
-  StringMapWrapper.keys(styles).forEach(key => { finalStyles[key] = null; });
+  Object.keys(styles).forEach(key => { finalStyles[key] = null; });
   return finalStyles;
 }
 
@@ -95,7 +97,8 @@ export function collectAndResolveStyles(
     collection: {[key: string]: string | number}, styles: {[key: string]: string | number}[]) {
   return styles.map(entry => {
     var stylesObj: {[key: string]: string | number} = {};
-    StringMapWrapper.forEach(entry, (value: string | number, prop: string) => {
+    Object.keys(entry).forEach(prop => {
+      let value = entry[prop];
       if (value == FILL_STYLE_FLAG) {
         value = collection[prop];
         if (!isPresent(value)) {
@@ -111,15 +114,13 @@ export function collectAndResolveStyles(
 
 export function renderStyles(
     element: any, renderer: any, styles: {[key: string]: string | number}): void {
-  StringMapWrapper.forEach(
-      styles, (value: string, prop: string) => { renderer.setElementStyle(element, prop, value); });
+  Object.keys(styles).forEach(prop => { renderer.setElementStyle(element, prop, styles[prop]); });
 }
 
 export function flattenStyles(styles: {[key: string]: string | number}[]): {[key: string]: string} {
   var finalStyles: {[key: string]: string} = {};
   styles.forEach(entry => {
-    StringMapWrapper.forEach(
-        entry, (value: string, prop: string) => { finalStyles[prop] = value; });
+    Object.keys(entry).forEach(prop => { finalStyles[prop] = entry[prop] as string; });
   });
   return finalStyles;
 }
diff --git a/modules/@angular/core/src/animation/view_animation_map.ts b/modules/@angular/core/src/animation/view_animation_map.ts
index ac20292f9916..5048b271658f 100644
--- a/modules/@angular/core/src/animation/view_animation_map.ts
+++ b/modules/@angular/core/src/animation/view_animation_map.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {StringMapWrapper} from '../facade/collection';
+
 import {isPresent} from '../facade/lang';
 
 import {AnimationPlayer} from './animation_player';
@@ -27,7 +27,7 @@ export class ViewAnimationMap {
   findAllPlayersByElement(element: any): AnimationPlayer[] {
     const el = this._map.get(element);
 
-    return el ? StringMapWrapper.values(el) : [];
+    return el ? Object.keys(el).map(k => el[k]) : [];
   }
 
   set(element: any, animationName: string, player: AnimationPlayer): void {
@@ -54,7 +54,7 @@ export class ViewAnimationMap {
       const index = this._allPlayers.indexOf(player);
       this._allPlayers.splice(index, 1);
 
-      if (StringMapWrapper.isEmpty(playersByAnimation)) {
+      if (Object.keys(playersByAnimation).length === 0) {
         this._map.delete(element);
       }
     }
diff --git a/modules/@angular/core/src/change_detection/differs/default_keyvalue_differ.ts b/modules/@angular/core/src/change_detection/differs/default_keyvalue_differ.ts
index ec2efbaf180e..98432fd0acb1 100644
--- a/modules/@angular/core/src/change_detection/differs/default_keyvalue_differ.ts
+++ b/modules/@angular/core/src/change_detection/differs/default_keyvalue_differ.ts
@@ -284,7 +284,7 @@ export class DefaultKeyValueDiffer implements KeyValueDiffer {
     if (obj instanceof Map) {
       obj.forEach(fn);
     } else {
-      StringMapWrapper.forEach(obj, fn);
+      Object.keys(obj).forEach(k => fn(obj[k], k));
     }
   }
 }
diff --git a/modules/@angular/core/src/linker/debug_context.ts b/modules/@angular/core/src/linker/debug_context.ts
index a19648802839..eb6e55f3c213 100644
--- a/modules/@angular/core/src/linker/debug_context.ts
+++ b/modules/@angular/core/src/linker/debug_context.ts
@@ -7,7 +7,6 @@
  */
 
 import {Injector} from '../di';
-import {StringMapWrapper} from '../facade/collection';
 import {isBlank, isPresent} from '../facade/lang';
 import {RenderDebugInfo} from '../render/api';
 
@@ -68,7 +67,8 @@ export class DebugContext implements RenderDebugInfo {
     var staticNodeInfo = this._staticNodeInfo;
     if (isPresent(staticNodeInfo)) {
       var refs = staticNodeInfo.refTokens;
-      StringMapWrapper.forEach(refs, (refToken: any, refName: string) => {
+      Object.keys(refs).forEach(refName => {
+        const refToken = refs[refName];
         let varValue: any;
         if (isBlank(refToken)) {
           varValue = this._view.allNodes ? this._view.allNodes[this._nodeIndex] : null;
diff --git a/modules/@angular/core/src/reflection/reflector.ts b/modules/@angular/core/src/reflection/reflector.ts
index ab045dcdd574..cf593706b195 100644
--- a/modules/@angular/core/src/reflection/reflector.ts
+++ b/modules/@angular/core/src/reflection/reflector.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {MapWrapper, StringMapWrapper} from '../facade/collection';
+import {MapWrapper} from '../facade/collection';
 import {isPresent} from '../facade/lang';
 import {Type} from '../type';
 import {PlatformReflectionCapabilities} from './platform_reflection_capabilities';
@@ -181,5 +181,5 @@ export class Reflector extends ReflectorReader {
 }
 
 function _mergeMaps(target: Map<string, Function>, config: {[key: string]: Function}): void {
-  StringMapWrapper.forEach(config, (v: Function, k: string) => target.set(k, v));
+  Object.keys(config).forEach(k => { target.set(k, config[k]); });
 }
diff --git a/modules/@angular/core/test/linker/change_detection_integration_spec.ts b/modules/@angular/core/test/linker/change_detection_integration_spec.ts
index bac67a04ff74..de25bbc51bc4 100644
--- a/modules/@angular/core/test/linker/change_detection_integration_spec.ts
+++ b/modules/@angular/core/test/linker/change_detection_integration_spec.ts
@@ -17,7 +17,6 @@ import {DomRootRenderer} from '@angular/platform-browser/src/dom/dom_renderer';
 
 import {MockSchemaRegistry} from '../../../compiler/testing/index';
 import {EventEmitter} from '../../src/facade/async';
-import {StringMapWrapper} from '../../src/facade/collection';
 import {NumberWrapper} from '../../src/facade/lang';
 
 export function main() {
@@ -1348,7 +1347,7 @@ class TestDirective implements OnInit, DoCheck, OnChanges, AfterContentInit, Aft
   ngOnChanges(changes: SimpleChanges) {
     this.log.add(this.name, 'ngOnChanges');
     const r: {[k: string]: string} = {};
-    StringMapWrapper.forEach(changes, (c: SimpleChange, key: string) => r[key] = c.currentValue);
+    Object.keys(changes).forEach(key => { r[key] = changes[key].currentValue; });
     this.changes = r;
     if (this.throwOn == 'ngOnChanges') {
       throw new Error('Boom!');
diff --git a/modules/@angular/core/testing/testing_internal.ts b/modules/@angular/core/testing/testing_internal.ts
index aa3c86ce7000..49a6476f8779 100644
--- a/modules/@angular/core/testing/testing_internal.ts
+++ b/modules/@angular/core/testing/testing_internal.ts
@@ -224,9 +224,7 @@ export class SpyObject {
     }
 
     var m = StringMapWrapper.merge(config, overrides);
-    StringMapWrapper.forEach(m, (value: any /** TODO #9100 */, key: any /** TODO #9100 */) => {
-      object.spy(key).andReturn(value);
-    });
+    Object.keys(m).forEach(key => { object.spy(key).andReturn(m[key]); });
     return object;
   }
 
diff --git a/modules/@angular/facade/src/collection.ts b/modules/@angular/facade/src/collection.ts
index 49a0b2ed7a88..c8838decbbd7 100644
--- a/modules/@angular/facade/src/collection.ts
+++ b/modules/@angular/facade/src/collection.ts
@@ -98,32 +98,6 @@ export class MapWrapper {
  * Wraps Javascript Objects
  */
 export class StringMapWrapper {
-  static create(): {[k: /*any*/ string]: any} {
-    // Note: We are not using Object.create(null) here due to
-    // performance!
-    // http://jsperf.com/ng2-object-create-null
-    return {};
-  }
-  static contains(map: {[key: string]: any}, key: string): boolean {
-    return map.hasOwnProperty(key);
-  }
-
-  static keys(map: {[key: string]: any}): string[] { return Object.keys(map); }
-  static values<T>(map: {[key: string]: T}): T[] {
-    return Object.keys(map).map((k: string): T => map[k]);
-  }
-  static isEmpty(map: {[key: string]: any}): boolean {
-    for (var prop in map) {
-      return false;
-    }
-    return true;
-  }
-  static forEach<K, V>(map: {[key: string]: V}, callback: (v: V, K: string) => void) {
-    for (let k of Object.keys(map)) {
-      callback(map[k], k);
-    }
-  }
-
   static merge<V>(m1: {[key: string]: V}, m2: {[key: string]: V}): {[key: string]: V} {
     var m: {[key: string]: V} = {};
 
@@ -317,4 +291,4 @@ export function iterateListLike(obj: any, fn: Function) {
       fn(item.value);
     }
   }
-}
\ No newline at end of file
+}
diff --git a/modules/@angular/forms/src/form_builder.ts b/modules/@angular/forms/src/form_builder.ts
index 20015e31570a..3c0462cf7d81 100644
--- a/modules/@angular/forms/src/form_builder.ts
+++ b/modules/@angular/forms/src/form_builder.ts
@@ -9,7 +9,6 @@
 import {Injectable} from '@angular/core';
 
 import {AsyncValidatorFn, ValidatorFn} from './directives/validators';
-import {StringMapWrapper} from './facade/collection';
 import {isArray, isPresent} from './facade/lang';
 import {AbstractControl, FormArray, FormControl, FormGroup} from './model';
 
@@ -75,8 +74,8 @@ export class FormBuilder {
   /** @internal */
   _reduceControls(controlsConfig: {[k: string]: any}): {[key: string]: AbstractControl} {
     var controls: {[key: string]: AbstractControl} = {};
-    StringMapWrapper.forEach(controlsConfig, (controlConfig: any, controlName: string) => {
-      controls[controlName] = this._createControl(controlConfig);
+    Object.keys(controlsConfig).forEach(controlName => {
+      controls[controlName] = this._createControl(controlsConfig[controlName]);
     });
     return controls;
   }
diff --git a/modules/@angular/forms/src/model.ts b/modules/@angular/forms/src/model.ts
index 9a7f911d5600..e3f5b79ce635 100644
--- a/modules/@angular/forms/src/model.ts
+++ b/modules/@angular/forms/src/model.ts
@@ -939,9 +939,9 @@ export class FormGroup extends AbstractControl {
    */
   setValue(value: {[key: string]: any}, {onlySelf}: {onlySelf?: boolean} = {}): void {
     this._checkAllValuesPresent(value);
-    StringMapWrapper.forEach(value, (newValue: any, name: string) => {
+    Object.keys(value).forEach(name => {
       this._throwIfControlMissing(name);
-      this.controls[name].setValue(newValue, {onlySelf: true});
+      this.controls[name].setValue(value[name], {onlySelf: true});
     });
     this.updateValueAndValidity({onlySelf: onlySelf});
   }
@@ -968,9 +968,9 @@ export class FormGroup extends AbstractControl {
    *  ```
    */
   patchValue(value: {[key: string]: any}, {onlySelf}: {onlySelf?: boolean} = {}): void {
-    StringMapWrapper.forEach(value, (newValue: any, name: string) => {
+    Object.keys(value).forEach(name => {
       if (this.controls[name]) {
-        this.controls[name].patchValue(newValue, {onlySelf: true});
+        this.controls[name].patchValue(value[name], {onlySelf: true});
       }
     });
     this.updateValueAndValidity({onlySelf: onlySelf});
@@ -1046,7 +1046,7 @@ export class FormGroup extends AbstractControl {
 
   /** @internal */
   _forEachChild(cb: (v: any, k: string) => void): void {
-    StringMapWrapper.forEach(this.controls, cb);
+    Object.keys(this.controls).forEach(k => cb(this.controls[k], k));
   }
 
   /** @internal */
diff --git a/modules/@angular/forms/src/validators.ts b/modules/@angular/forms/src/validators.ts
index 805bebdbea22..e0cd411c7e29 100644
--- a/modules/@angular/forms/src/validators.ts
+++ b/modules/@angular/forms/src/validators.ts
@@ -152,5 +152,5 @@ function _mergeErrors(arrayOfErrors: any[]): {[key: string]: any} {
       arrayOfErrors.reduce((res: {[key: string]: any}, errors: {[key: string]: any}) => {
         return isPresent(errors) ? StringMapWrapper.merge(res, errors) : res;
       }, {});
-  return StringMapWrapper.isEmpty(res) ? null : res;
+  return Object.keys(res).length === 0 ? null : res;
 }
diff --git a/modules/@angular/platform-browser/src/dom/web_animations_driver.ts b/modules/@angular/platform-browser/src/dom/web_animations_driver.ts
index 49653106bf38..ca8edbef5d0b 100644
--- a/modules/@angular/platform-browser/src/dom/web_animations_driver.ts
+++ b/modules/@angular/platform-browser/src/dom/web_animations_driver.ts
@@ -7,8 +7,6 @@
  */
 
 import {AUTO_STYLE} from '@angular/core';
-
-import {StringMapWrapper} from '../facade/collection';
 import {StringWrapper, isNumber, isPresent} from '../facade/lang';
 import {AnimationKeyframe, AnimationStyles} from '../private_import_core';
 
@@ -65,15 +63,16 @@ function _populateStyles(
     defaultStyles: {[key: string]: string | number}): {[key: string]: string | number} {
   var data: {[key: string]: string | number} = {};
   styles.styles.forEach((entry) => {
-    StringMapWrapper.forEach(entry, (val: any, prop: string) => {
+    Object.keys(entry).forEach(prop => {
+      const val = entry[prop];
       var formattedProp = dashCaseToCamelCase(prop);
       data[formattedProp] =
           val == AUTO_STYLE ? val : val.toString() + _resolveStyleUnit(val, prop, formattedProp);
     });
   });
-  StringMapWrapper.forEach(defaultStyles, (value: string, prop: string) => {
+  Object.keys(defaultStyles).forEach(prop => {
     if (!isPresent(data[prop])) {
-      data[prop] = value;
+      data[prop] = defaultStyles[prop];
     }
   });
   return data;
diff --git a/modules/@angular/platform-browser/src/dom/web_animations_player.ts b/modules/@angular/platform-browser/src/dom/web_animations_player.ts
index 79749d6fb4c7..db1eb4495a13 100644
--- a/modules/@angular/platform-browser/src/dom/web_animations_player.ts
+++ b/modules/@angular/platform-browser/src/dom/web_animations_player.ts
@@ -7,8 +7,6 @@
  */
 
 import {AUTO_STYLE} from '@angular/core';
-
-import {StringMapWrapper} from '../facade/collection';
 import {isPresent} from '../facade/lang';
 import {AnimationPlayer} from '../private_import_core';
 
@@ -49,7 +47,8 @@ export class WebAnimationsPlayer implements AnimationPlayer {
 
     var keyframes = this.keyframes.map(styles => {
       var formattedKeyframe: {[key: string]: string | number} = {};
-      StringMapWrapper.forEach(styles, (value: string | number, prop: string) => {
+      Object.keys(styles).forEach(prop => {
+        const value = styles[prop];
         formattedKeyframe[prop] = value == AUTO_STYLE ? _computeStyle(this.element, prop) : value;
       });
       return formattedKeyframe;
diff --git a/modules/@angular/platform-browser/test/dom/web_animations_driver_spec.ts b/modules/@angular/platform-browser/test/dom/web_animations_driver_spec.ts
index e455bc11daf9..660737baadc6 100644
--- a/modules/@angular/platform-browser/test/dom/web_animations_driver_spec.ts
+++ b/modules/@angular/platform-browser/test/dom/web_animations_driver_spec.ts
@@ -12,7 +12,6 @@ import {el} from '@angular/platform-browser/testing/browser_util';
 import {DomAnimatePlayer} from '../../src/dom/dom_animate_player';
 import {WebAnimationsDriver} from '../../src/dom/web_animations_driver';
 import {WebAnimationsPlayer} from '../../src/dom/web_animations_player';
-import {StringMapWrapper} from '../../src/facade/collection';
 import {AnimationKeyframe, AnimationStyles} from '../../src/private_import_core';
 import {MockDomAnimatePlayer} from '../../testing/mock_dom_animate_player';
 
@@ -113,7 +112,7 @@ export function main() {
       var player = driver.animate(elm, startingStyles, styles, 1000, 1000, null);
       var details = _formatOptions(player);
       var options = details['options'];
-      var keys = StringMapWrapper.keys(options);
+      var keys = Object.keys(options);
       expect(keys.indexOf('easing')).toEqual(-1);
     });
   });
diff --git a/modules/@angular/platform-browser/testing/matchers.ts b/modules/@angular/platform-browser/testing/matchers.ts
index b904f09189aa..1bfe35c51f22 100644
--- a/modules/@angular/platform-browser/testing/matchers.ts
+++ b/modules/@angular/platform-browser/testing/matchers.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {StringMapWrapper} from './facade/collection';
+
 import {global, isString} from './facade/lang';
 import {getDOM} from './private_import_platform-browser';
 
@@ -190,9 +190,9 @@ _global.beforeEach(function() {
           if (isString(styles)) {
             allPassed = getDOM().hasStyle(actual, styles);
           } else {
-            allPassed = !StringMapWrapper.isEmpty(styles);
-            StringMapWrapper.forEach(styles, (style: string, prop: string) => {
-              allPassed = allPassed && getDOM().hasStyle(actual, prop, style);
+            allPassed = Object.keys(styles).length !== 0;
+            Object.keys(styles).forEach(prop => {
+              allPassed = allPassed && getDOM().hasStyle(actual, prop, styles[prop]);
             });
           }
 
diff --git a/modules/@angular/platform-browser/testing/mock_animation_driver.ts b/modules/@angular/platform-browser/testing/mock_animation_driver.ts
index 1719a2b964ef..af8bf395c164 100644
--- a/modules/@angular/platform-browser/testing/mock_animation_driver.ts
+++ b/modules/@angular/platform-browser/testing/mock_animation_driver.ts
@@ -9,8 +9,6 @@
 import {AnimationPlayer} from '@angular/core';
 import {MockAnimationPlayer} from '@angular/core/testing/testing_internal';
 import {AnimationDriver} from '@angular/platform-browser';
-
-import {StringMapWrapper} from './facade/collection';
 import {AnimationKeyframe, AnimationStyles} from './private_import_core';
 
 export class MockAnimationDriver extends AnimationDriver {
@@ -40,7 +38,7 @@ function _serializeKeyframes(keyframes: AnimationKeyframe[]): any[] {
 function _serializeStyles(styles: AnimationStyles): {[key: string]: any} {
   var flatStyles: {[key: string]: any} = {};
   styles.styles.forEach((entry: {[key: string]: string | number;}) => {
-    StringMapWrapper.forEach(entry, (val: any, prop: string) => { flatStyles[prop] = val; });
+    Object.keys(entry).forEach(prop => { flatStyles[prop] = entry[prop]; });
   });
   return flatStyles;
 }
diff --git a/modules/@angular/platform-server/src/parse5_adapter.ts b/modules/@angular/platform-server/src/parse5_adapter.ts
index 44228eb65a0d..bda029d42f7a 100644
--- a/modules/@angular/platform-server/src/parse5_adapter.ts
+++ b/modules/@angular/platform-server/src/parse5_adapter.ts
@@ -8,7 +8,7 @@
 
 const parse5 = require('parse5');
 
-import {ListWrapper, StringMapWrapper} from '../src/facade/collection';
+import {ListWrapper} from '../src/facade/collection';
 import {DomAdapter, setRootDomAdapter} from './private_import_platform-browser';
 import {isPresent, isBlank, global, setValueOnPath} from '../src/facade/lang';
 import {SelectorMatcher, CssSelector} from './private_import_compiler';
@@ -474,7 +474,7 @@ export class Parse5DomAdapter extends DomAdapter {
     this.appendChild(newDoc, body);
     newDoc['head'] = head;
     newDoc['body'] = body;
-    newDoc['_window'] = StringMapWrapper.create();
+    newDoc['_window'] = {};
     return newDoc;
   }
   defaultDoc(): Document { return defDoc = defDoc || this.createHtmlDocument(); }
diff --git a/modules/benchmarks/src/tree/ng2_ftl/index.ts b/modules/benchmarks/src/tree/ng2_ftl/index.ts
index 6790e9057f00..c72296c6999c 100644
--- a/modules/benchmarks/src/tree/ng2_ftl/index.ts
+++ b/modules/benchmarks/src/tree/ng2_ftl/index.ts
@@ -1,8 +1,8 @@
-import {ApplicationRef, NgModule, enableProdMode} from '@angular/core';
+import {ApplicationRef, enableProdMode} from '@angular/core';
 import {platformBrowser} from '@angular/platform-browser';
 
 import {bindAction, profile} from '../../util';
-import {TreeNode, buildTree, emptyTree} from '../util';
+import {buildTree, emptyTree} from '../util';
 
 import {AppModuleNgFactory} from './app.ngfactory';
 import {TreeComponent} from './tree';
diff --git a/modules/benchmarks/src/tree/ng2_static_ftl/index.ts b/modules/benchmarks/src/tree/ng2_static_ftl/index.ts
index f07c63c49374..38bd32108bef 100644
--- a/modules/benchmarks/src/tree/ng2_static_ftl/index.ts
+++ b/modules/benchmarks/src/tree/ng2_static_ftl/index.ts
@@ -1,8 +1,8 @@
-import {ApplicationRef, NgModule, enableProdMode} from '@angular/core';
+import {ApplicationRef, enableProdMode} from '@angular/core';
 import {platformBrowser} from '@angular/platform-browser';
 
 import {bindAction, profile} from '../../util';
-import {TreeNode, buildTree, emptyTree} from '../util';
+import {buildTree, emptyTree} from '../util';
 
 import {AppModuleNgFactory} from './app.ngfactory';
 import {TreeRootComponent} from './tree';

From 6f7ed3215431d427d45f119598f4a94a142f2efb Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Tue, 4 Oct 2016 15:40:31 -0700
Subject: [PATCH 63/70] fix(ShadowCss): fix attribute selectors in :host and
 :host-context (#12056)

Fix a regression introduced in #11917 while fixing #6249
---
 modules/@angular/compiler/src/shadow_css.ts   | 62 ++++++++---------
 .../@angular/compiler/test/shadow_css_spec.ts | 67 ++++++++++++++-----
 2 files changed, 80 insertions(+), 49 deletions(-)

diff --git a/modules/@angular/compiler/src/shadow_css.ts b/modules/@angular/compiler/src/shadow_css.ts
index 71d0c33bc780..ddc30555e30d 100644
--- a/modules/@angular/compiler/src/shadow_css.ts
+++ b/modules/@angular/compiler/src/shadow_css.ts
@@ -209,7 +209,8 @@ export class ShadowCss {
    *  scopeName .foo { ... }
   */
   private _scopeCssText(cssText: string, scopeSelector: string, hostSelector: string): string {
-    const unscoped = this._extractUnscopedRulesFromCssText(cssText);
+    const unscopedRules = this._extractUnscopedRulesFromCssText(cssText);
+    // replace :host and :host-context -shadowcsshost and -shadowcsshost respectively
     cssText = this._insertPolyfillHostInCssText(cssText);
     cssText = this._convertColonHost(cssText);
     cssText = this._convertColonHostContext(cssText);
@@ -217,7 +218,7 @@ export class ShadowCss {
     if (scopeSelector) {
       cssText = this._scopeSelectors(cssText, scopeSelector, hostSelector);
     }
-    cssText = cssText + '\n' + unscoped;
+    cssText = cssText + '\n' + unscopedRules;
     return cssText.trim();
   }
 
@@ -280,15 +281,15 @@ export class ShadowCss {
   }
 
   private _convertColonRule(cssText: string, regExp: RegExp, partReplacer: Function): string {
-    // m[1] = :host, m[2] = contents of (), m[3] rest of rule
+    // m[1] = :host(-context), m[2] = contents of (), m[3] rest of rule
     return cssText.replace(regExp, function(...m: string[]) {
       if (m[2]) {
         const parts = m[2].split(',');
         const r: string[] = [];
         for (let i = 0; i < parts.length; i++) {
-          let p = parts[i];
+          let p = parts[i].trim();
           if (!p) break;
-          r.push(partReplacer(_polyfillHostNoCombinator, p.trim(), m[3]));
+          r.push(partReplacer(_polyfillHostNoCombinator, p, m[3]));
         }
         return r.join(',');
       } else {
@@ -314,8 +315,7 @@ export class ShadowCss {
    * by replacing with space.
   */
   private _convertShadowDOMSelectors(cssText: string): string {
-    return _shadowDOMSelectorsRe.reduce(
-        (result, pattern) => { return result.replace(pattern, ' '); }, cssText);
+    return _shadowDOMSelectorsRe.reduce((result, pattern) => result.replace(pattern, ' '), cssText);
   }
 
   // change a selector like 'div' to 'name div'
@@ -420,38 +420,38 @@ export class ShadowCss {
       return scopedP;
     };
 
-    const sep = /( |>|\+|~(?!=)|\[|\])\s*/g;
-    const scopeAfter = selector.indexOf(_polyfillHostNoCombinator);
+    let attrSelectorIndex = 0;
+    const attrSelectors: string[] = [];
+
+    // replace attribute selectors with placeholders to avoid issue with white space being treated
+    // as separator
+    selector = selector.replace(/\[[^\]]*\]/g, (attrSelector) => {
+      const replaceBy = `__attr_sel_${attrSelectorIndex}__`;
+      attrSelectors.push(attrSelector);
+      attrSelectorIndex++;
+      return replaceBy;
+    });
 
-    let scoped = '';
+    let scopedSelector = '';
     let startIndex = 0;
     let res: RegExpExecArray;
-    let inAttributeSelector: boolean = false;
+    const sep = /( |>|\+|~(?!=))\s*/g;
+    const scopeAfter = selector.indexOf(_polyfillHostNoCombinator);
 
     while ((res = sep.exec(selector)) !== null) {
       const separator = res[1];
-      if (separator === '[') {
-        inAttributeSelector = true;
-        scoped += selector.slice(startIndex, res.index).trim() + '[';
-        startIndex = sep.lastIndex;
-      }
-      if (!inAttributeSelector) {
-        const part = selector.slice(startIndex, res.index).trim();
-        // if a selector appears before :host-context it should not be shimmed as it
-        // matches on ancestor elements and not on elements in the host's shadow
-        const scopedPart = startIndex >= scopeAfter ? _scopeSelectorPart(part) : part;
-        scoped += `${scopedPart} ${separator} `;
-        startIndex = sep.lastIndex;
-      } else if (separator === ']') {
-        const part = selector.slice(startIndex, res.index).trim() + ']';
-        const scopedPart = startIndex >= scopeAfter ? _scopeSelectorPart(part) : part;
-        scoped += `${scopedPart} `;
-        startIndex = sep.lastIndex;
-        inAttributeSelector = false;
-      }
+      const part = selector.slice(startIndex, res.index).trim();
+      // if a selector appears before :host-context it should not be shimmed as it
+      // matches on ancestor elements and not on elements in the host's shadow
+      const scopedPart = startIndex >= scopeAfter ? _scopeSelectorPart(part) : part;
+      scopedSelector += `${scopedPart} ${separator} `;
+      startIndex = sep.lastIndex;
     }
 
-    return scoped + _scopeSelectorPart(selector.substring(startIndex));
+    scopedSelector += _scopeSelectorPart(selector.substring(startIndex));
+
+    // replace the placeholders with their original values
+    return scopedSelector.replace(/__attr_sel_(\d+)__/g, (ph, index) => attrSelectors[+index]);
   }
 
   private _insertPolyfillHostInCssText(selector: string): string {
diff --git a/modules/@angular/compiler/test/shadow_css_spec.ts b/modules/@angular/compiler/test/shadow_css_spec.ts
index 30a4455d1442..6afb87de01da 100644
--- a/modules/@angular/compiler/test/shadow_css_spec.ts
+++ b/modules/@angular/compiler/test/shadow_css_spec.ts
@@ -108,30 +108,61 @@ export function main() {
       expect(s('[is="one"] {}', 'a')).toEqual('[is="one"][a] {}');
     });
 
-    it('should handle :host', () => {
-      expect(s(':host {}', 'a', 'a-host')).toEqual('[a-host] {}');
+    describe((':host'), () => {
+      it('should handle no context',
+         () => { expect(s(':host {}', 'a', 'a-host')).toEqual('[a-host] {}'); });
 
-      expect(s(':host(.x) {}', 'a', 'a-host')).toEqual('.x[a-host] {}');
-      expect(s(':host(ul) {}', 'a', 'a-host')).toEqual('ul[a-host] {}');
+      it('should handle tag selector', () => {
+        expect(s(':host(ul) {}', 'a', 'a-host')).toEqual('ul[a-host] {}');
 
-      expect(s(':host(.x,.y) {}', 'a', 'a-host')).toEqual('.x[a-host], .y[a-host] {}');
-      expect(s(':host(ul,li) {}', 'a', 'a-host')).toEqual('ul[a-host], li[a-host] {}');
+      });
+
+      it('should handle class selector',
+         () => { expect(s(':host(.x) {}', 'a', 'a-host')).toEqual('.x[a-host] {}'); });
+
+      it('should handle attribute selector', () => {
+        expect(s(':host([a="b"]) {}', 'a', 'a-host')).toEqual('[a="b"][a-host] {}');
+        expect(s(':host([a=b]) {}', 'a', 'a-host')).toEqual('[a="b"][a-host] {}');
+      });
+
+      it('should handle multiple tag selectors', () => {
+        expect(s(':host(ul,li) {}', 'a', 'a-host')).toEqual('ul[a-host], li[a-host] {}');
+        expect(s(':host(ul,li) > .z {}', 'a', 'a-host'))
+            .toEqual('ul[a-host] > .z[a], li[a-host] > .z[a] {}');
+      });
+
+      it('should handle multiple class selectors', () => {
+        expect(s(':host(.x,.y) {}', 'a', 'a-host')).toEqual('.x[a-host], .y[a-host] {}');
+        expect(s(':host(.x,.y) > .z {}', 'a', 'a-host'))
+            .toEqual('.x[a-host] > .z[a], .y[a-host] > .z[a] {}');
+      });
 
-      expect(s(':host(.x,.y) > .z {}', 'a', 'a-host'))
-          .toEqual('.x[a-host] > .z[a], .y[a-host] > .z[a] {}');
-      expect(s(':host(ul,li) > .z {}', 'a', 'a-host'))
-          .toEqual('ul[a-host] > .z[a], li[a-host] > .z[a] {}');
+      it('should handle multiple attribute selectors', () => {
+        expect(s(':host([a="b"],[c=d]) {}', 'a', 'a-host'))
+            .toEqual('[a="b"][a-host], [c="d"][a-host] {}');
+      });
     });
 
-    it('should handle :host-context', () => {
-      expect(s(':host-context(.x) {}', 'a', 'a-host')).toEqual('.x[a-host], .x [a-host] {}');
-      expect(s(':host-context(div) {}', 'a', 'a-host')).toEqual('div[a-host], div [a-host] {}');
+    describe((':host-context'), () => {
+      it('should handle tag selector', () => {
+        expect(s(':host-context(div) {}', 'a', 'a-host')).toEqual('div[a-host], div [a-host] {}');
+        expect(s(':host-context(ul) > .y {}', 'a', 'a-host'))
+            .toEqual('ul[a-host] > .y[a], ul [a-host] > .y[a] {}');
+      });
 
-      expect(s(':host-context(.x) > .y {}', 'a', 'a-host'))
-          .toEqual('.x[a-host] > .y[a], .x [a-host] > .y[a] {}');
-      expect(s(':host-context(ul) > .y {}', 'a', 'a-host'))
-          .toEqual('ul[a-host] > .y[a], ul [a-host] > .y[a] {}');
+      it('should handle class selector', () => {
+        expect(s(':host-context(.x) {}', 'a', 'a-host')).toEqual('.x[a-host], .x [a-host] {}');
 
+        expect(s(':host-context(.x) > .y {}', 'a', 'a-host'))
+            .toEqual('.x[a-host] > .y[a], .x [a-host] > .y[a] {}');
+      });
+
+      it('should handle attribute selector', () => {
+        expect(s(':host-context([a="b"]) {}', 'a', 'a-host'))
+            .toEqual('[a="b"][a-host], [a="b"] [a-host] {}');
+        expect(s(':host-context([a=b]) {}', 'a', 'a-host'))
+            .toEqual('[a=b][a-host], [a="b"] [a-host] {}');
+      });
     });
 
     it('should support polyfill-next-selector', () => {
@@ -142,7 +173,7 @@ export function main() {
       expect(css).toEqual('x[a] > y[a]{}');
 
       css = s(`polyfill-next-selector {content: 'button[priority="1"]'} z {}`, 'a');
-      expect(css).toEqual('button[priority="1"][a] {}');
+      expect(css).toEqual('button[priority="1"][a]{}');
     });
 
     it('should support polyfill-unscoped-rule', () => {

From 0528dcb9dc754f21ce8f82013dabdb06b07b88db Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Tue, 4 Oct 2016 15:57:37 -0700
Subject: [PATCH 64/70] refactor: simplify arrow functions (#12057)

---
 browser-providers.conf.js                              |  4 +---
 .../src/webdriver/chrome_driver_extension.ts           |  2 +-
 .../benchpress/test/metric/multi_metric_spec.ts        |  2 +-
 .../benchpress/test/reporter/multi_reporter_spec.ts    |  2 +-
 modules/@angular/benchpress/test/sampler_spec.ts       |  6 +++---
 .../benchpress/test/web_driver_extension_spec.ts       |  2 +-
 .../test/webdriver/chrome_driver_extension_spec.ts     | 10 +++++-----
 .../@angular/compiler/src/output/abstract_emitter.ts   |  2 +-
 modules/@angular/compiler/src/util.ts                  |  2 +-
 .../compiler/src/view_compiler/compile_query.ts        |  5 ++---
 .../compiler/test/animation/animation_parser_spec.ts   | 10 +++++-----
 .../@angular/compiler/testing/metadata_overrider.ts    |  2 +-
 .../core/test/animation/animation_integration_spec.ts  |  3 +--
 .../differs/default_iterable_differ_spec.ts            |  3 +--
 modules/@angular/core/test/zone/ng_zone_spec.ts        |  2 +-
 modules/@angular/forms/test/form_array_spec.ts         |  4 ++--
 modules/@angular/forms/test/form_group_spec.ts         |  4 ++--
 .../platform-browser/src/browser/testability.ts        |  2 +-
 modules/@angular/platform-browser/src/dom/debug/by.ts  |  2 +-
 modules/@angular/platform-browser/src/dom/util.ts      |  4 ++--
 .../src/web_workers/worker/location_providers.ts       |  2 +-
 modules/@angular/router/src/router.ts                  |  3 +--
 modules/@angular/router/test/integration.spec.ts       |  7 +++----
 modules/@angular/upgrade/test/upgrade_spec.ts          |  4 ++--
 .../e2e_test/web_workers/router/router_spec.ts         |  5 ++---
 25 files changed, 43 insertions(+), 51 deletions(-)

diff --git a/browser-providers.conf.js b/browser-providers.conf.js
index 6107380903bd..4b6f079f1cff 100644
--- a/browser-providers.conf.js
+++ b/browser-providers.conf.js
@@ -333,7 +333,5 @@ function buildConfiguration(type, target, required) {
       var conf = CIconfiguration[item][type];
       return conf.required === required && conf.target === target;
     })
-    .map((item) => {
-      return target + '_' + item.toUpperCase();
-    });
+    .map((item) => target + '_' + item.toUpperCase());
 }
diff --git a/modules/@angular/benchpress/src/webdriver/chrome_driver_extension.ts b/modules/@angular/benchpress/src/webdriver/chrome_driver_extension.ts
index 384ae4a0fdac..e89d4264e335 100644
--- a/modules/@angular/benchpress/src/webdriver/chrome_driver_extension.ts
+++ b/modules/@angular/benchpress/src/webdriver/chrome_driver_extension.ts
@@ -169,7 +169,7 @@ export class ChromeDriverExtension extends WebDriverExtension {
       eventCategories: string[], eventName: string, expectedCategories: string[],
       expectedName: string = null): boolean {
     var hasCategories = expectedCategories.reduce(
-        (value, cat) => { return value && eventCategories.indexOf(cat) !== -1; }, true);
+        (value, cat) => value && eventCategories.indexOf(cat) !== -1, true);
     return !expectedName ? hasCategories : hasCategories && eventName === expectedName;
   }
 
diff --git a/modules/@angular/benchpress/test/metric/multi_metric_spec.ts b/modules/@angular/benchpress/test/metric/multi_metric_spec.ts
index 445a31836994..9ee463253fc5 100644
--- a/modules/@angular/benchpress/test/metric/multi_metric_spec.ts
+++ b/modules/@angular/benchpress/test/metric/multi_metric_spec.ts
@@ -13,7 +13,7 @@ export function main() {
   function createMetric(ids: any[]) {
     var m = ReflectiveInjector
                 .resolveAndCreate([
-                  ids.map(id => { return {provide: id, useValue: new MockMetric(id)}; }),
+                  ids.map(id => ({provide: id, useValue: new MockMetric(id)})),
                   MultiMetric.provideWith(ids)
                 ])
                 .get(MultiMetric);
diff --git a/modules/@angular/benchpress/test/reporter/multi_reporter_spec.ts b/modules/@angular/benchpress/test/reporter/multi_reporter_spec.ts
index c880fc63931b..f52588d808ec 100644
--- a/modules/@angular/benchpress/test/reporter/multi_reporter_spec.ts
+++ b/modules/@angular/benchpress/test/reporter/multi_reporter_spec.ts
@@ -14,7 +14,7 @@ export function main() {
   function createReporters(ids: any[]) {
     var r = ReflectiveInjector
                 .resolveAndCreate([
-                  ids.map(id => { return {provide: id, useValue: new MockReporter(id)}; }),
+                  ids.map(id => ({provide: id, useValue: new MockReporter(id)})),
                   MultiReporter.provideWith(ids)
                 ])
                 .get(MultiReporter);
diff --git a/modules/@angular/benchpress/test/sampler_spec.ts b/modules/@angular/benchpress/test/sampler_spec.ts
index b52f4b2dea94..2f6bc0ad1273 100644
--- a/modules/@angular/benchpress/test/sampler_spec.ts
+++ b/modules/@angular/benchpress/test/sampler_spec.ts
@@ -60,8 +60,8 @@ export function main() {
          createSampler({
            driver: driver,
            validator: createCountingValidator(2),
-           prepare: () => { return count++; },
-           execute: () => { return count++; }
+           prepare: () => count++,
+           execute: () => count++,
          });
          sampler.sample().then((_) => {
            expect(count).toBe(4);
@@ -221,7 +221,7 @@ function createCountingValidator(
 
 function createCountingMetric(log: any[] = []) {
   var scriptTime = 0;
-  return new MockMetric(log, () => { return {'script': scriptTime++}; });
+  return new MockMetric(log, () => ({'script': scriptTime++}));
 }
 
 class MockDriverAdapter extends WebDriverAdapter {
diff --git a/modules/@angular/benchpress/test/web_driver_extension_spec.ts b/modules/@angular/benchpress/test/web_driver_extension_spec.ts
index ed70dc5fda0f..eb968cfa5e34 100644
--- a/modules/@angular/benchpress/test/web_driver_extension_spec.ts
+++ b/modules/@angular/benchpress/test/web_driver_extension_spec.ts
@@ -17,7 +17,7 @@ export function main() {
       try {
         res(ReflectiveInjector
                 .resolveAndCreate([
-                  ids.map((id) => { return {provide: id, useValue: new MockExtension(id)}; }),
+                  ids.map((id) => ({provide: id, useValue: new MockExtension(id)})),
                   {provide: Options.CAPABILITIES, useValue: caps},
                   WebDriverExtension.provideFirstSupported(ids)
                 ])
diff --git a/modules/@angular/benchpress/test/webdriver/chrome_driver_extension_spec.ts b/modules/@angular/benchpress/test/webdriver/chrome_driver_extension_spec.ts
index f3ab34ecd3cb..5c1376f08ec1 100644
--- a/modules/@angular/benchpress/test/webdriver/chrome_driver_extension_spec.ts
+++ b/modules/@angular/benchpress/test/webdriver/chrome_driver_extension_spec.ts
@@ -396,11 +396,11 @@ class MockDriverAdapter extends WebDriverAdapter {
   logs(type: string) {
     this._log.push(['logs', type]);
     if (type === 'performance') {
-      return Promise.resolve(this._events.map((event) => {
-        return {
-          'message': Json.stringify({'message': {'method': this._messageMethod, 'params': event}})
-        };
-      }));
+      return Promise.resolve(this._events.map(
+          (event) => ({
+            'message':
+                Json.stringify({'message': {'method': this._messageMethod, 'params': event}})
+          })));
     } else {
       return null;
     }
diff --git a/modules/@angular/compiler/src/output/abstract_emitter.ts b/modules/@angular/compiler/src/output/abstract_emitter.ts
index 54dc6b1981a9..f9ed12a5fea9 100644
--- a/modules/@angular/compiler/src/output/abstract_emitter.ts
+++ b/modules/@angular/compiler/src/output/abstract_emitter.ts
@@ -400,7 +400,7 @@ export abstract class AbstractEmitterVisitor implements o.StatementVisitor, o.Ex
   }
 
   visitAllStatements(statements: o.Statement[], ctx: EmitterVisitorContext): void {
-    statements.forEach((stmt) => { return stmt.visitStatement(this, ctx); });
+    statements.forEach((stmt) => stmt.visitStatement(this, ctx));
   }
 }
 
diff --git a/modules/@angular/compiler/src/util.ts b/modules/@angular/compiler/src/util.ts
index 512c897566d2..0cc67890327e 100644
--- a/modules/@angular/compiler/src/util.ts
+++ b/modules/@angular/compiler/src/util.ts
@@ -16,7 +16,7 @@ var CAMEL_CASE_REGEXP = /([A-Z])/g;
 
 export function camelCaseToDashCase(input: string): string {
   return StringWrapper.replaceAllMapped(
-      input, CAMEL_CASE_REGEXP, (m: string[]) => { return '-' + m[1].toLowerCase(); });
+      input, CAMEL_CASE_REGEXP, (m: string[]) => '-' + m[1].toLowerCase());
 }
 
 export function splitAtColon(input: string, defaultValues: string[]): string[] {
diff --git a/modules/@angular/compiler/src/view_compiler/compile_query.ts b/modules/@angular/compiler/src/view_compiler/compile_query.ts
index 1bd02aa237c4..ab7b71e77c3e 100644
--- a/modules/@angular/compiler/src/view_compiler/compile_query.ts
+++ b/modules/@angular/compiler/src/view_compiler/compile_query.ts
@@ -101,9 +101,8 @@ function createQueryValues(viewValues: ViewQueryValues): o.Expression[] {
 function mapNestedViews(
     declarationAppElement: o.Expression, view: CompileView,
     expressions: o.Expression[]): o.Expression {
-  var adjustedExpressions: o.Expression[] = expressions.map((expr) => {
-    return o.replaceVarInExpression(o.THIS_EXPR.name, o.variable('nestedView'), expr);
-  });
+  var adjustedExpressions: o.Expression[] = expressions.map(
+      (expr) => o.replaceVarInExpression(o.THIS_EXPR.name, o.variable('nestedView'), expr));
   return declarationAppElement.callMethod('mapNestedViews', [
     o.variable(view.className),
     o.fn(
diff --git a/modules/@angular/compiler/test/animation/animation_parser_spec.ts b/modules/@angular/compiler/test/animation/animation_parser_spec.ts
index f78005816719..a726fd23fb92 100644
--- a/modules/@angular/compiler/test/animation/animation_parser_spec.ts
+++ b/modules/@angular/compiler/test/animation/animation_parser_spec.ts
@@ -24,8 +24,9 @@ export function main() {
       return flatStyles;
     };
 
-    var collectKeyframeStyles = (keyframe: AnimationKeyframeAst):
-        {[key: string]: string | number} => { return combineStyles(keyframe.styles); };
+    var collectKeyframeStyles =
+        (keyframe: AnimationKeyframeAst): {[key: string]: string | number} =>
+            combineStyles(keyframe.styles);
 
     var collectStepStyles = (step: AnimationStepAst): Array<{[key: string]: string | number}> => {
       var keyframes = step.keyframes;
@@ -51,9 +52,8 @@ export function main() {
     var getAnimationAstFromEntryAst =
         (ast: AnimationEntryAst) => { return ast.stateTransitions[0].animation; };
 
-    var parseAnimationAst = (data: AnimationMetadata[]) => {
-      return getAnimationAstFromEntryAst(parseAnimation(data).ast);
-    };
+    var parseAnimationAst = (data: AnimationMetadata[]) =>
+        getAnimationAstFromEntryAst(parseAnimation(data).ast);
 
     var parseAnimationAndGetErrors = (data: AnimationMetadata[]) => parseAnimation(data).errors;
 
diff --git a/modules/@angular/compiler/testing/metadata_overrider.ts b/modules/@angular/compiler/testing/metadata_overrider.ts
index f5c909da1183..c7b2bebe5934 100644
--- a/modules/@angular/compiler/testing/metadata_overrider.ts
+++ b/modules/@angular/compiler/testing/metadata_overrider.ts
@@ -60,7 +60,7 @@ function removeMetadata(metadata: StringMap, remove: any, references: Map<any, s
     const propValue = metadata[prop];
     if (propValue instanceof Array) {
       metadata[prop] = propValue.filter(
-          (value: any) => { return !removeObjects.has(_propHashKey(prop, value, references)); });
+          (value: any) => !removeObjects.has(_propHashKey(prop, value, references)));
     } else {
       if (removeObjects.has(_propHashKey(prop, propValue, references))) {
         metadata[prop] = undefined;
diff --git a/modules/@angular/core/test/animation/animation_integration_spec.ts b/modules/@angular/core/test/animation/animation_integration_spec.ts
index 622c0b3bc59b..283d1d4c89d1 100644
--- a/modules/@angular/core/test/animation/animation_integration_spec.ts
+++ b/modules/@angular/core/test/animation/animation_integration_spec.ts
@@ -758,8 +758,7 @@ function declareTests({useJit}: {useJit: boolean}) {
       describe('*ngFor', () => {
         let tpl = '<div *ngFor="let item of items" @trigger>{{ item }}</div>';
 
-        let getText =
-            (node: any) => { return node.innerHTML ? node.innerHTML : node.children[0].data; };
+        let getText = (node: any) => node.innerHTML ? node.innerHTML : node.children[0].data;
 
         let assertParentChildContents = (parent: any, content: string) => {
           var values: string[] = [];
diff --git a/modules/@angular/core/test/change_detection/differs/default_iterable_differ_spec.ts b/modules/@angular/core/test/change_detection/differs/default_iterable_differ_spec.ts
index 9b2a878c0a4f..2505badbe5c9 100644
--- a/modules/@angular/core/test/change_detection/differs/default_iterable_differ_spec.ts
+++ b/modules/@angular/core/test/change_detection/differs/default_iterable_differ_spec.ts
@@ -486,8 +486,7 @@ export function main() {
 
       var trackByItemId = (index: number, item: any): any => item.id;
 
-      var buildItemList =
-          (list: string[]) => { return list.map((val) => { return new ItemWithId(val); }); };
+      var buildItemList = (list: string[]) => list.map((val) => new ItemWithId(val));
 
       beforeEach(() => { differ = new DefaultIterableDiffer(trackByItemId); });
 
diff --git a/modules/@angular/core/test/zone/ng_zone_spec.ts b/modules/@angular/core/test/zone/ng_zone_spec.ts
index 5f7a99354c90..42f2878f2c4c 100644
--- a/modules/@angular/core/test/zone/ng_zone_spec.ts
+++ b/modules/@angular/core/test/zone/ng_zone_spec.ts
@@ -214,7 +214,7 @@ function commonTests() {
   describe('run', () => {
     it('should return the body return value from run',
        inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
-         macroTask(() => { expect(_zone.run(() => { return 6; })).toEqual(6); });
+         macroTask(() => { expect(_zone.run(() => 6)).toEqual(6); });
 
          macroTask(() => { async.done(); });
        }), testTimeout);
diff --git a/modules/@angular/forms/test/form_array_spec.ts b/modules/@angular/forms/test/form_array_spec.ts
index f5d09b8dd126..76ba0644db8a 100644
--- a/modules/@angular/forms/test/form_array_spec.ts
+++ b/modules/@angular/forms/test/form_array_spec.ts
@@ -814,7 +814,7 @@ export function main() {
 
       describe('disabled errors', () => {
         it('should clear out array errors when disabled', () => {
-          const arr = new FormArray([new FormControl()], () => { return {'expected': true}; });
+          const arr = new FormArray([new FormControl()], () => ({'expected': true}));
           expect(arr.errors).toEqual({'expected': true});
 
           arr.disable();
@@ -825,7 +825,7 @@ export function main() {
         });
 
         it('should re-populate array errors when enabled from a child', () => {
-          const arr = new FormArray([new FormControl()], () => { return {'expected': true}; });
+          const arr = new FormArray([new FormControl()], () => ({'expected': true}));
           arr.disable();
           expect(arr.errors).toEqual(null);
 
diff --git a/modules/@angular/forms/test/form_group_spec.ts b/modules/@angular/forms/test/form_group_spec.ts
index 4d787ee6a471..0c1d131d26ad 100644
--- a/modules/@angular/forms/test/form_group_spec.ts
+++ b/modules/@angular/forms/test/form_group_spec.ts
@@ -823,7 +823,7 @@ export function main() {
 
       describe('disabled errors', () => {
         it('should clear out group errors when disabled', () => {
-          const g = new FormGroup({'one': new FormControl()}, () => { return {'expected': true}; });
+          const g = new FormGroup({'one': new FormControl()}, () => ({'expected': true}));
           expect(g.errors).toEqual({'expected': true});
 
           g.disable();
@@ -834,7 +834,7 @@ export function main() {
         });
 
         it('should re-populate group errors when enabled from a child', () => {
-          const g = new FormGroup({'one': new FormControl()}, () => { return {'expected': true}; });
+          const g = new FormGroup({'one': new FormControl()}, () => ({'expected': true}));
           g.disable();
           expect(g.errors).toEqual(null);
 
diff --git a/modules/@angular/platform-browser/src/browser/testability.ts b/modules/@angular/platform-browser/src/browser/testability.ts
index 569e937832a5..ff7ae2a3d85c 100644
--- a/modules/@angular/platform-browser/src/browser/testability.ts
+++ b/modules/@angular/platform-browser/src/browser/testability.ts
@@ -24,7 +24,7 @@ export class BrowserGetTestability implements GetTestability {
       return testability;
     };
 
-    global.getAllAngularTestabilities = () => { return registry.getAllTestabilities(); };
+    global.getAllAngularTestabilities = () => registry.getAllTestabilities();
 
     global.getAllAngularRootElements = () => registry.getAllRootElements();
 
diff --git a/modules/@angular/platform-browser/src/dom/debug/by.ts b/modules/@angular/platform-browser/src/dom/debug/by.ts
index 0e3771ab996b..07cb0570992b 100644
--- a/modules/@angular/platform-browser/src/dom/debug/by.ts
+++ b/modules/@angular/platform-browser/src/dom/debug/by.ts
@@ -52,6 +52,6 @@ export class By {
    * {@example platform-browser/dom/debug/ts/by/by.ts region='by_directive'}
    */
   static directive(type: Type<any>): Predicate<DebugElement> {
-    return (debugElement) => { return debugElement.providerTokens.indexOf(type) !== -1; };
+    return (debugElement) => debugElement.providerTokens.indexOf(type) !== -1;
   }
 }
diff --git a/modules/@angular/platform-browser/src/dom/util.ts b/modules/@angular/platform-browser/src/dom/util.ts
index 0ed68a80a0dd..c482c4392ee4 100644
--- a/modules/@angular/platform-browser/src/dom/util.ts
+++ b/modules/@angular/platform-browser/src/dom/util.ts
@@ -14,10 +14,10 @@ var DASH_CASE_REGEXP = /-([a-z])/g;
 
 export function camelCaseToDashCase(input: string): string {
   return StringWrapper.replaceAllMapped(
-      input, CAMEL_CASE_REGEXP, (m: any /** TODO #9100 */) => { return '-' + m[1].toLowerCase(); });
+      input, CAMEL_CASE_REGEXP, (m: string[]) => '-' + m[1].toLowerCase());
 }
 
 export function dashCaseToCamelCase(input: string): string {
   return StringWrapper.replaceAllMapped(
-      input, DASH_CASE_REGEXP, (m: any /** TODO #9100 */) => { return m[1].toUpperCase(); });
+      input, DASH_CASE_REGEXP, (m: string[]) => m[1].toUpperCase());
 }
diff --git a/modules/@angular/platform-webworker/src/web_workers/worker/location_providers.ts b/modules/@angular/platform-webworker/src/web_workers/worker/location_providers.ts
index 17999d387532..76c8066ffe88 100644
--- a/modules/@angular/platform-webworker/src/web_workers/worker/location_providers.ts
+++ b/modules/@angular/platform-webworker/src/web_workers/worker/location_providers.ts
@@ -28,5 +28,5 @@ export const WORKER_APP_LOCATION_PROVIDERS = [
 
 function appInitFnFactory(platformLocation: WebWorkerPlatformLocation, zone: NgZone): () =>
     Promise<boolean> {
-  return () => { return zone.runGuarded(() => platformLocation.init()); };
+  return () => zone.runGuarded(() => platformLocation.init());
 }
diff --git a/modules/@angular/router/src/router.ts b/modules/@angular/router/src/router.ts
index f5da74f61315..462ae2010862 100644
--- a/modules/@angular/router/src/router.ts
+++ b/modules/@angular/router/src/router.ts
@@ -577,8 +577,7 @@ export class Router {
         preActivation.traverse(this.outletMap);
       });
 
-      const preactivation2$ =
-          mergeMap.call(preactivation$, () => { return preActivation.checkGuards(); });
+      const preactivation2$ = mergeMap.call(preactivation$, () => preActivation.checkGuards());
 
       const resolveData$ = mergeMap.call(preactivation2$, (shouldActivate: boolean) => {
         if (shouldActivate) {
diff --git a/modules/@angular/router/test/integration.spec.ts b/modules/@angular/router/test/integration.spec.ts
index 4a529dc443b6..f20b919b7f40 100644
--- a/modules/@angular/router/test/integration.spec.ts
+++ b/modules/@angular/router/test/integration.spec.ts
@@ -971,8 +971,7 @@ describe('Integration', () => {
           TestBed.configureTestingModule({
             providers: [{
               provide: 'CanActivate',
-              useValue:
-                  (a: ActivatedRouteSnapshot, b: RouterStateSnapshot) => { return of (false); }
+              useValue: (a: ActivatedRouteSnapshot, b: RouterStateSnapshot) => of (false),
             }]
           });
         });
@@ -1046,7 +1045,7 @@ describe('Integration', () => {
                 useValue: (c: any, a: ActivatedRouteSnapshot, b: RouterStateSnapshot) => {
                   return a.params['name'] === 'victor';
                 }
-              }
+              },
             ]
           });
         });
@@ -1191,7 +1190,7 @@ describe('Integration', () => {
           TestBed.configureTestingModule({
             providers: [{
               provide: 'alwaysFalse',
-              useValue: (a: any, b: any) => { return a.params.id === '22'; }
+              useValue: (a: any, b: any) => a.params.id === '22',
             }]
           });
         });
diff --git a/modules/@angular/upgrade/test/upgrade_spec.ts b/modules/@angular/upgrade/test/upgrade_spec.ts
index 52bbbd27311a..8dd42cc23911 100644
--- a/modules/@angular/upgrade/test/upgrade_spec.ts
+++ b/modules/@angular/upgrade/test/upgrade_spec.ts
@@ -77,8 +77,8 @@ export function main() {
            };
            const adapter: UpgradeAdapter = new UpgradeAdapter(forwardRef(() => Ng2Module));
 
-           ng1Module.directive('ng1a', () => { return {template: '{{ l(\'ng1a\') }}'}; });
-           ng1Module.directive('ng1b', () => { return {template: '{{ l(\'ng1b\') }}'}; });
+           ng1Module.directive('ng1a', () => ({template: '{{ l(\'ng1a\') }}'}));
+           ng1Module.directive('ng1b', () => ({template: '{{ l(\'ng1b\') }}'}));
            ng1Module.run(($rootScope: any /** TODO #9100 */) => {
              $rootScope.l = l;
              $rootScope.reset = () => log.length = 0;
diff --git a/modules/playground/e2e_test/web_workers/router/router_spec.ts b/modules/playground/e2e_test/web_workers/router/router_spec.ts
index 81a5930b1334..5c315f1a48c2 100644
--- a/modules/playground/e2e_test/web_workers/router/router_spec.ts
+++ b/modules/playground/e2e_test/web_workers/router/router_spec.ts
@@ -67,7 +67,7 @@ describe('WebWorker Router', () => {
     browser.wait(() => {
       let deferred = protractor.promise.defer();
       var elem = element(by.css(contentSelector));
-      elem.getText().then((text) => { return deferred.fulfill(text === expected); });
+      elem.getText().then((text) => deferred.fulfill(text === expected));
       return deferred.promise;
     }, 5000);
   }
@@ -75,8 +75,7 @@ describe('WebWorker Router', () => {
   function waitForUrl(regex: any /** TODO #9100 */): void {
     browser.wait(() => {
       let deferred = protractor.promise.defer();
-      browser.getCurrentUrl().then(
-          (url) => { return deferred.fulfill(url.match(regex) !== null); });
+      browser.getCurrentUrl().then((url) => deferred.fulfill(url.match(regex) !== null));
       return deferred.promise;
     }, 5000);
   }

From 205103bdaa6bd0291481103ea12ccfecc100e243 Mon Sep 17 00:00:00 2001
From: Igor Minar <iminar@google.com>
Date: Tue, 4 Oct 2016 16:13:32 -0700
Subject: [PATCH 65/70] docs(traige): update triaging doc

---
 TRIAGE_AND_LABELS.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/TRIAGE_AND_LABELS.md b/TRIAGE_AND_LABELS.md
index d184f5df779b..e50dc9436f53 100644
--- a/TRIAGE_AND_LABELS.md
+++ b/TRIAGE_AND_LABELS.md
@@ -17,9 +17,9 @@ with it.
 
 * `comp: animations`: `@matsko`
 * `comp: benchpress`: `@tbosch`
-* `comp: build/ci`: `@IgorMinar` -- All build and CI scripts 
+* `comp: build & ci`: `@IgorMinar` -- All build and CI scripts 
 * `comp: common`: `@mhevery`  -- This includes core components / pipes.
-* `comp: core/compiler`: `@tbosch` -- Because core and compiler are very 
+* `comp: core & compiler`: `@tbosch` -- Because core and compiler are very 
   intertwined, we will be treating them as one.
 * `comp: forms`: `@kara`
 * `comp: http`: `@jeffbcross`
@@ -29,14 +29,14 @@ with it.
 * `comp: testing`: `@juliemr`
 * `comp: upgrade`: `@mhevery`
 * `comp: web-worker`: `@vicb`
-* `comp: zone`: `@mhevery`
+* `comp: zones`: `@mhevery`
 
 There are few components which are cross-cutting. They don't have
 a clear location in the source tree. We will treat them as a component
 even thought no specific source tree is associated with them.
 
 * `comp: documentation`: `@naomiblack`
-* `comp: packaging`: `@mhevery`
+* `comp: packaging`: `@IgorMinar`
 * `comp: performance`: `@tbosch`
 * `comp: security`: `@IgorMinar`
 

From e00de0c6062d6f8653e88154d6828529844b7bdf Mon Sep 17 00:00:00 2001
From: Pawel Kozlowski <pkozlowski.opensource@gmail.com>
Date: Wed, 5 Oct 2016 01:14:23 +0200
Subject: [PATCH 66/70] fix(forms): properly validate empty strings with
 patterns (#11450)

---
 modules/@angular/forms/src/validators.ts       | 1 -
 modules/@angular/forms/test/validators_spec.ts | 9 +++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/modules/@angular/forms/src/validators.ts b/modules/@angular/forms/src/validators.ts
index e0cd411c7e29..865cdc0d0df1 100644
--- a/modules/@angular/forms/src/validators.ts
+++ b/modules/@angular/forms/src/validators.ts
@@ -96,7 +96,6 @@ export class Validators {
    */
   static pattern(pattern: string): ValidatorFn {
     return (control: AbstractControl): {[key: string]: any} => {
-      if (isPresent(Validators.required(control))) return null;
       let regex = new RegExp(`^${pattern}$`);
       let v: string = control.value;
       return regex.test(v) ? null :
diff --git a/modules/@angular/forms/test/validators_spec.ts b/modules/@angular/forms/test/validators_spec.ts
index 921965171d93..280a3241fdc8 100644
--- a/modules/@angular/forms/test/validators_spec.ts
+++ b/modules/@angular/forms/test/validators_spec.ts
@@ -91,6 +91,9 @@ export function main() {
       it('should not error on null',
          () => { expect(Validators.pattern('[a-zA-Z ]*')(new FormControl(null))).toEqual(null); });
 
+      it('should not error on null value and "null" pattern',
+         () => { expect(Validators.pattern('null')(new FormControl(null))).toEqual(null); });
+
       it('should not error on valid strings', () => {
         expect(Validators.pattern('[a-zA-Z ]*')(new FormControl('aaAA'))).toEqual(null);
       });
@@ -100,6 +103,12 @@ export function main() {
           'pattern': {'requiredPattern': '^[a-zA-Z ]*$', 'actualValue': 'aaa0'}
         });
       });
+
+      it('should error on failure to match empty string', () => {
+        expect(Validators.pattern('[a-zA-Z]+')(new FormControl(''))).toEqual({
+          'pattern': {'requiredPattern': '^[a-zA-Z]+$', 'actualValue': ''}
+        });
+      });
     });
 
     describe('compose', () => {

From d25cd244af4d1affba66d9c5c3f22a1c9d8e66ac Mon Sep 17 00:00:00 2001
From: Tobias Bosch <tbosch1009@gmail.com>
Date: Tue, 4 Oct 2016 16:27:45 -0700
Subject: [PATCH 67/70] refactor(benchmarks): refactor to support AOT bootstrap
 in G3 (#12075)

---
 modules/benchmarks/src/bootstrap_plain.ts     |  4 +-
 .../src/largetable/baseline/index.html        |  8 +++-
 .../src/largetable/baseline/index.ts          | 32 ++++++++-------
 .../benchmarks/src/largetable/ng2/index.html  |  8 +++-
 .../benchmarks/src/largetable/ng2/index.ts    | 40 +++----------------
 modules/benchmarks/src/largetable/ng2/init.ts | 32 +++++++++++++++
 .../src/largetable/ng2_switch/index.html      |  8 +++-
 .../src/largetable/ng2_switch/index.ts        | 40 +++----------------
 .../src/largetable/ng2_switch/init.ts         | 32 +++++++++++++++
 .../benchmarks/src/tree/baseline/index.html   |  8 +++-
 modules/benchmarks/src/tree/baseline/index.ts | 32 ++++++++-------
 modules/benchmarks/src/tree/ng2/index.html    |  8 +++-
 modules/benchmarks/src/tree/ng2/index.ts      | 40 +++----------------
 modules/benchmarks/src/tree/ng2/init.ts       | 32 +++++++++++++++
 14 files changed, 180 insertions(+), 144 deletions(-)
 create mode 100644 modules/benchmarks/src/largetable/ng2/init.ts
 create mode 100644 modules/benchmarks/src/largetable/ng2_switch/init.ts
 create mode 100644 modules/benchmarks/src/tree/ng2/init.ts

diff --git a/modules/benchmarks/src/bootstrap_plain.ts b/modules/benchmarks/src/bootstrap_plain.ts
index 2ea20a188c61..b2c62c53ae67 100644
--- a/modules/benchmarks/src/bootstrap_plain.ts
+++ b/modules/benchmarks/src/bootstrap_plain.ts
@@ -20,7 +20,9 @@
     });
 
     // BOOTSTRAP the app!
-    System.import('index').then(function(m: any) { m.main(); }, console.error.bind(console));
+    System.import('index').then(function(m: any) {
+      m.main && m.main();
+    }, console.error.bind(console));
   }
 
   function writeScriptTag(scriptUrl: string, onload?: string) {
diff --git a/modules/benchmarks/src/largetable/baseline/index.html b/modules/benchmarks/src/largetable/baseline/index.html
index faf53dbce77f..6c922ffe496b 100644
--- a/modules/benchmarks/src/largetable/baseline/index.html
+++ b/modules/benchmarks/src/largetable/baseline/index.html
@@ -22,9 +22,13 @@ <h2>Baseline Largetable Benchmark</h2>
   </p>
 
   <div>
-    <largetable id="root"></largetable>
+    <largetable id="root">Loading...</largetable>
   </div>
 
-  <script src="../../bootstrap_plain.js"></script>
+  <script>
+    var mainUrl = window.location.search.split(/[?&]main=([^&]+)/)[1]
+      || '../../bootstrap_plain.js';
+    document.write('<script src="' + mainUrl + '">\u003c/script>');
+  </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/modules/benchmarks/src/largetable/baseline/index.ts b/modules/benchmarks/src/largetable/baseline/index.ts
index d3458cd31033..efbdae30cc17 100644
--- a/modules/benchmarks/src/largetable/baseline/index.ts
+++ b/modules/benchmarks/src/largetable/baseline/index.ts
@@ -2,24 +2,28 @@ import {bindAction, profile} from '../../util';
 import {buildTable, emptyTable} from '../util';
 import {TableComponent} from './table';
 
-export function main() {
-  var table: TableComponent;
+var table: TableComponent;
 
-  function destroyDom() { table.data = emptyTable; }
-
-  function createDom() { table.data = buildTable(); }
+function destroyDom() {
+  table.data = emptyTable;
+}
 
-  function noop() {}
+function createDom() {
+  table.data = buildTable();
+}
 
-  function init() {
-    table = new TableComponent(document.querySelector('largetable'));
+function noop() {}
 
-    bindAction('#destroyDom', destroyDom);
-    bindAction('#createDom', createDom);
+function init() {
+  const rootEl = document.querySelector('largetable');
+  rootEl.textContent = '';
+  table = new TableComponent(rootEl);
 
-    bindAction('#updateDomProfile', profile(createDom, noop, 'update'));
-    bindAction('#createDomProfile', profile(createDom, destroyDom, 'create'));
-  }
+  bindAction('#destroyDom', destroyDom);
+  bindAction('#createDom', createDom);
 
-  init();
+  bindAction('#updateDomProfile', profile(createDom, noop, 'update'));
+  bindAction('#createDomProfile', profile(createDom, destroyDom, 'create'));
 }
+
+init();
diff --git a/modules/benchmarks/src/largetable/ng2/index.html b/modules/benchmarks/src/largetable/ng2/index.html
index 37b72355b4bc..3842f866250b 100644
--- a/modules/benchmarks/src/largetable/ng2/index.html
+++ b/modules/benchmarks/src/largetable/ng2/index.html
@@ -22,9 +22,13 @@ <h2>Ng2 Largetable Benchmark</h2>
   </p>
 
   <div>
-    <largetable id="root"></largetable>
+    <largetable id="root">Loading...</largetable>
   </div>
 
-  <script src="../../bootstrap_ng2.js"></script>
+  <script>
+    var mainUrl = window.location.search.split(/[?&]main=([^&]+)/)[1]
+      || '../../bootstrap_ng2.js';
+    document.write('<script src="' + mainUrl + '">\u003c/script>');
+  </script>
 </body>
 </html>
diff --git a/modules/benchmarks/src/largetable/ng2/index.ts b/modules/benchmarks/src/largetable/ng2/index.ts
index 2376daa97632..60753688aee1 100644
--- a/modules/benchmarks/src/largetable/ng2/index.ts
+++ b/modules/benchmarks/src/largetable/ng2/index.ts
@@ -1,40 +1,10 @@
-import {ApplicationRef, enableProdMode} from '@angular/core';
+import {enableProdMode} from '@angular/core';
 import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
 
-import {bindAction, profile} from '../../util';
-import {buildTable, emptyTable} from '../util';
-
-import {AppModule, TableComponent} from './table';
+import {init} from './init';
+import {AppModule} from './table';
 
 export function main() {
-  var table: TableComponent;
-  var appRef: ApplicationRef;
-
-  function destroyDom() {
-    table.data = emptyTable;
-    appRef.tick();
-  }
-
-  function createDom() {
-    table.data = buildTable();
-    appRef.tick();
-  }
-
-  function noop() {}
-
-  function init() {
-    enableProdMode();
-    platformBrowserDynamic().bootstrapModule(AppModule).then((ref) => {
-      var injector = ref.injector;
-      appRef = injector.get(ApplicationRef);
-
-      table = appRef.components[0].instance;
-      bindAction('#destroyDom', destroyDom);
-      bindAction('#createDom', createDom);
-      bindAction('#updateDomProfile', profile(createDom, noop, 'update'));
-      bindAction('#createDomProfile', profile(createDom, destroyDom, 'create'));
-    });
-  }
-
-  init();
+  enableProdMode();
+  platformBrowserDynamic().bootstrapModule(AppModule).then(init);
 }
diff --git a/modules/benchmarks/src/largetable/ng2/init.ts b/modules/benchmarks/src/largetable/ng2/init.ts
new file mode 100644
index 000000000000..ef9d6d1354da
--- /dev/null
+++ b/modules/benchmarks/src/largetable/ng2/init.ts
@@ -0,0 +1,32 @@
+import {ApplicationRef, NgModuleRef} from '@angular/core';
+
+import {bindAction, profile} from '../../util';
+import {buildTable, emptyTable} from '../util';
+
+import {AppModule, TableComponent} from './table';
+
+export function init(moduleRef: NgModuleRef<AppModule>) {
+  let table: TableComponent;
+  let appRef: ApplicationRef;
+
+  function destroyDom() {
+    table.data = emptyTable;
+    appRef.tick();
+  }
+
+  function createDom() {
+    table.data = buildTable();
+    appRef.tick();
+  }
+
+  function noop() {}
+
+  const injector = moduleRef.injector;
+  appRef = injector.get(ApplicationRef);
+
+  table = appRef.components[0].instance;
+  bindAction('#destroyDom', destroyDom);
+  bindAction('#createDom', createDom);
+  bindAction('#updateDomProfile', profile(createDom, noop, 'update'));
+  bindAction('#createDomProfile', profile(createDom, destroyDom, 'create'));
+}
diff --git a/modules/benchmarks/src/largetable/ng2_switch/index.html b/modules/benchmarks/src/largetable/ng2_switch/index.html
index fdf0f45aaa87..9cd629ebc277 100644
--- a/modules/benchmarks/src/largetable/ng2_switch/index.html
+++ b/modules/benchmarks/src/largetable/ng2_switch/index.html
@@ -22,9 +22,13 @@ <h2>Ng2 with NgSwitch Largetable Benchmark</h2>
   </p>
 
   <div>
-    <largetable id="root"></largetable>
+    <largetable id="root">Loading...</largetable>
   </div>
 
-  <script src="../../bootstrap_ng2.js"></script>
+  <script>
+    var mainUrl = window.location.search.split(/[?&]main=([^&]+)/)[1]
+      || '../../bootstrap_ng2.js';
+    document.write('<script src="' + mainUrl + '">\u003c/script>');
+  </script>
 </body>
 </html>
diff --git a/modules/benchmarks/src/largetable/ng2_switch/index.ts b/modules/benchmarks/src/largetable/ng2_switch/index.ts
index 2376daa97632..60753688aee1 100644
--- a/modules/benchmarks/src/largetable/ng2_switch/index.ts
+++ b/modules/benchmarks/src/largetable/ng2_switch/index.ts
@@ -1,40 +1,10 @@
-import {ApplicationRef, enableProdMode} from '@angular/core';
+import {enableProdMode} from '@angular/core';
 import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
 
-import {bindAction, profile} from '../../util';
-import {buildTable, emptyTable} from '../util';
-
-import {AppModule, TableComponent} from './table';
+import {init} from './init';
+import {AppModule} from './table';
 
 export function main() {
-  var table: TableComponent;
-  var appRef: ApplicationRef;
-
-  function destroyDom() {
-    table.data = emptyTable;
-    appRef.tick();
-  }
-
-  function createDom() {
-    table.data = buildTable();
-    appRef.tick();
-  }
-
-  function noop() {}
-
-  function init() {
-    enableProdMode();
-    platformBrowserDynamic().bootstrapModule(AppModule).then((ref) => {
-      var injector = ref.injector;
-      appRef = injector.get(ApplicationRef);
-
-      table = appRef.components[0].instance;
-      bindAction('#destroyDom', destroyDom);
-      bindAction('#createDom', createDom);
-      bindAction('#updateDomProfile', profile(createDom, noop, 'update'));
-      bindAction('#createDomProfile', profile(createDom, destroyDom, 'create'));
-    });
-  }
-
-  init();
+  enableProdMode();
+  platformBrowserDynamic().bootstrapModule(AppModule).then(init);
 }
diff --git a/modules/benchmarks/src/largetable/ng2_switch/init.ts b/modules/benchmarks/src/largetable/ng2_switch/init.ts
new file mode 100644
index 000000000000..ef9d6d1354da
--- /dev/null
+++ b/modules/benchmarks/src/largetable/ng2_switch/init.ts
@@ -0,0 +1,32 @@
+import {ApplicationRef, NgModuleRef} from '@angular/core';
+
+import {bindAction, profile} from '../../util';
+import {buildTable, emptyTable} from '../util';
+
+import {AppModule, TableComponent} from './table';
+
+export function init(moduleRef: NgModuleRef<AppModule>) {
+  let table: TableComponent;
+  let appRef: ApplicationRef;
+
+  function destroyDom() {
+    table.data = emptyTable;
+    appRef.tick();
+  }
+
+  function createDom() {
+    table.data = buildTable();
+    appRef.tick();
+  }
+
+  function noop() {}
+
+  const injector = moduleRef.injector;
+  appRef = injector.get(ApplicationRef);
+
+  table = appRef.components[0].instance;
+  bindAction('#destroyDom', destroyDom);
+  bindAction('#createDom', createDom);
+  bindAction('#updateDomProfile', profile(createDom, noop, 'update'));
+  bindAction('#createDomProfile', profile(createDom, destroyDom, 'create'));
+}
diff --git a/modules/benchmarks/src/tree/baseline/index.html b/modules/benchmarks/src/tree/baseline/index.html
index b531ca02ac03..3bfb6340970c 100644
--- a/modules/benchmarks/src/tree/baseline/index.html
+++ b/modules/benchmarks/src/tree/baseline/index.html
@@ -19,9 +19,13 @@ <h2>Baseline Tree Benchmark</h2>
   </p>
 
   <div>
-    <tree id="root"></tree>
+    <tree id="root">Loading...</tree>
   </div>
 
-  <script src="../../bootstrap_plain.js"></script>
+  <script>
+    var mainUrl = window.location.search.split(/[?&]main=([^&]+)/)[1]
+      || '../../bootstrap_plain.js';
+    document.write('<script src="' + mainUrl + '">\u003c/script>');
+  </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/modules/benchmarks/src/tree/baseline/index.ts b/modules/benchmarks/src/tree/baseline/index.ts
index 045e5018c254..a17677a66d64 100644
--- a/modules/benchmarks/src/tree/baseline/index.ts
+++ b/modules/benchmarks/src/tree/baseline/index.ts
@@ -2,24 +2,28 @@ import {bindAction, profile} from '../../util';
 import {buildTree, emptyTree} from '../util';
 import {TreeComponent} from './tree';
 
-export function main() {
-  var tree: TreeComponent;
+var tree: TreeComponent;
 
-  function destroyDom() { tree.data = emptyTree; }
-
-  function createDom() { tree.data = buildTree(); }
+function destroyDom() {
+  tree.data = emptyTree;
+}
 
-  function noop() {}
+function createDom() {
+  tree.data = buildTree();
+}
 
-  function init() {
-    tree = new TreeComponent(document.querySelector('tree'));
+function noop() {}
 
-    bindAction('#destroyDom', destroyDom);
-    bindAction('#createDom', createDom);
+function init() {
+  const rootEl = document.querySelector('tree');
+  rootEl.textContent = '';
+  tree = new TreeComponent(rootEl);
 
-    bindAction('#updateDomProfile', profile(createDom, noop, 'update'));
-    bindAction('#createDomProfile', profile(createDom, destroyDom, 'create'));
-  }
+  bindAction('#destroyDom', destroyDom);
+  bindAction('#createDom', createDom);
 
-  init();
+  bindAction('#updateDomProfile', profile(createDom, noop, 'update'));
+  bindAction('#createDomProfile', profile(createDom, destroyDom, 'create'));
 }
+
+init();
diff --git a/modules/benchmarks/src/tree/ng2/index.html b/modules/benchmarks/src/tree/ng2/index.html
index e64dc3402174..598f64fd1af4 100644
--- a/modules/benchmarks/src/tree/ng2/index.html
+++ b/modules/benchmarks/src/tree/ng2/index.html
@@ -19,9 +19,13 @@ <h2>Ng2 Tree Benchmark</h2>
   </p>
 
   <div>
-    <tree id="root"></tree>
+    <tree id="root">Loading...</tree>
   </div>
 
-  <script src="../../bootstrap_ng2.js"></script>
+  <script>
+    var mainUrl = window.location.search.split(/[?&]main=([^&]+)/)[1]
+      || '../../bootstrap_ng2.js';
+    document.write('<script src="' + mainUrl + '">\u003c/script>');
+  </script>
 </body>
 </html>
diff --git a/modules/benchmarks/src/tree/ng2/index.ts b/modules/benchmarks/src/tree/ng2/index.ts
index 7c8c66b4416d..46623a157e81 100644
--- a/modules/benchmarks/src/tree/ng2/index.ts
+++ b/modules/benchmarks/src/tree/ng2/index.ts
@@ -1,40 +1,10 @@
-import {ApplicationRef, enableProdMode} from '@angular/core';
+import {enableProdMode} from '@angular/core';
 import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
 
-import {bindAction, profile} from '../../util';
-import {buildTree, emptyTree} from '../util';
-
-import {AppModule, TreeComponent} from './tree';
+import {init} from './init';
+import {AppModule} from './tree';
 
 export function main() {
-  var tree: TreeComponent;
-  var appRef: ApplicationRef;
-
-  function destroyDom() {
-    tree.data = emptyTree;
-    appRef.tick();
-  }
-
-  function createDom() {
-    tree.data = buildTree();
-    appRef.tick();
-  }
-
-  function noop() {}
-
-  function init() {
-    enableProdMode();
-    platformBrowserDynamic().bootstrapModule(AppModule).then((ref) => {
-      var injector = ref.injector;
-      appRef = injector.get(ApplicationRef);
-
-      tree = appRef.components[0].instance;
-      bindAction('#destroyDom', destroyDom);
-      bindAction('#createDom', createDom);
-      bindAction('#updateDomProfile', profile(createDom, noop, 'update'));
-      bindAction('#createDomProfile', profile(createDom, destroyDom, 'create'));
-    });
-  }
-
-  init();
+  enableProdMode();
+  platformBrowserDynamic().bootstrapModule(AppModule).then(init);
 }
diff --git a/modules/benchmarks/src/tree/ng2/init.ts b/modules/benchmarks/src/tree/ng2/init.ts
new file mode 100644
index 000000000000..d708fdbefbd3
--- /dev/null
+++ b/modules/benchmarks/src/tree/ng2/init.ts
@@ -0,0 +1,32 @@
+import {ApplicationRef, NgModuleRef} from '@angular/core';
+
+import {bindAction, profile} from '../../util';
+import {buildTree, emptyTree} from '../util';
+
+import {AppModule, TreeComponent} from './tree';
+
+export function init(moduleRef: NgModuleRef<AppModule>) {
+  let tree: TreeComponent;
+  let appRef: ApplicationRef;
+
+  function destroyDom() {
+    tree.data = emptyTree;
+    appRef.tick();
+  }
+
+  function createDom() {
+    tree.data = buildTree();
+    appRef.tick();
+  }
+
+  function noop() {}
+
+  const injector = moduleRef.injector;
+  appRef = injector.get(ApplicationRef);
+
+  tree = appRef.components[0].instance;
+  bindAction('#destroyDom', destroyDom);
+  bindAction('#createDom', createDom);
+  bindAction('#updateDomProfile', profile(createDom, noop, 'update'));
+  bindAction('#createDomProfile', profile(createDom, destroyDom, 'create'));
+}

From 0fde7ecd0f080644073f09c785e306d9de717009 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Tue, 4 Oct 2016 20:39:20 -0700
Subject: [PATCH 68/70] refactor: add license header to JS files & format files
 (#12081)

---
 browser-providers.conf.js                     | 384 +++++-------------
 gulpfile.js                                   | 146 ++++---
 karma-js.conf.js                              |  56 +--
 .../@angular/common/rollup-testing.config.js  |   9 +-
 modules/@angular/common/rollup.config.js      |  11 +-
 .../integrationtest/webpack.config.js         |  16 +-
 .../compiler/rollup-testing.config.js         |   9 +-
 modules/@angular/compiler/rollup.config.js    |  13 +-
 .../@angular/core/rollup-testing.config.js    |  12 +-
 modules/@angular/core/rollup.config.js        |  12 +-
 modules/@angular/forms/rollup.config.js       |   9 +-
 .../@angular/http/rollup-testing.config.js    |   9 +-
 modules/@angular/http/rollup.config.js        |   9 +-
 .../rollup-testing.config.js                  |  13 +-
 .../platform-browser-dynamic/rollup.config.js |  15 +-
 .../platform-browser/rollup-testing.config.js |   9 +-
 .../platform-browser/rollup.config.js         |  11 +-
 .../platform-server/rollup-testing.config.js  |   9 +-
 .../@angular/platform-server/rollup.config.js |   9 +-
 .../rollup.config.js                          |  15 +-
 .../platform-webworker/rollup.config.js       |   9 +-
 modules/@angular/router/karma-test-shim.js    | 132 +++---
 modules/@angular/router/karma.conf.js         |  42 +-
 .../@angular/router/rollup-testing.config.js  |  10 +-
 modules/@angular/router/rollup.config.js      |  15 +-
 modules/@angular/upgrade/rollup.config.js     |  14 +-
 modules/angular1_router/build.js              |   8 +
 modules/angular1_router/karma-router.conf.js  |   8 +
 .../angular1_router/src/module_template.js    |   7 +
 modules/angular1_router/src/ng_route_shim.js  |  13 +-
 .../test/integration/animation_spec.js        |   8 +
 .../test/integration/lifecycle_hook_spec.js   |   8 +
 .../test/integration/navigation_spec.js       |   8 +
 .../test/integration/router_spec.js           |   8 +
 .../test/integration/shim_spec.js             |   8 +
 modules/angular1_router/test/ng_link_spec.js  |   8 +
 modules/angular1_router/test/util.es5.js      |   8 +
 .../playground/src/web_workers/images/b64.js  |   1 +
 .../src/web_workers/images/bitmap.js          |  22 +-
 .../src/web_workers/images/loader.js          |  42 +-
 .../src/web_workers/input/loader.js           |  41 +-
 .../src/web_workers/kitchen_sink/loader.js    |  41 +-
 .../src/web_workers/message_broker/loader.js  |  41 +-
 .../src/web_workers/router/loader.js          |  41 +-
 .../playground/src/web_workers/todo/loader.js |  41 +-
 modules/rollup-test/hello_world.js            |   8 +
 modules/rollup-test/rollup.config.js          |   8 +
 protractor-e2e.conf.js                        |  35 +-
 protractor-examples-e2e.conf.js               |  28 +-
 protractor-perf.conf.js                       |  34 +-
 scripts/browserstack/start_tunnel.js          |   8 +
 test-main.js                                  | 173 +++-----
 tools/build/benchpress.js                     |  13 +-
 tools/build/file2modulename.js                |  31 +-
 tools/build/licensewrap.js                    |  10 +-
 tools/build/linknodemodules.js                |  16 +-
 tools/build/logging.js                        |  29 +-
 tools/build/snippets/url_params_to_form.js    |  12 +-
 tools/build/util.js                           |  21 +-
 tools/build/watch.js                          |  28 +-
 tools/build/watch.spec.js                     |  41 +-
 .../build/webpack/angular2-all-testing.umd.js |  12 +-
 tools/build/webpack/angular2-all.umd.js       |   8 +
 tools/build/webpack/promiseify.js             |  13 +-
 tools/check-environment.js                    |  41 +-
 tools/chromedriverpatch.js                    |  20 +-
 tools/code.angularjs.org/add-license-to-rx.js |  42 +-
 tools/karma/reporter.js                       |  62 +--
 tools/npm/check-node-modules.js               |  16 +-
 tools/npm/clean-shrinkwrap.js                 |  18 +-
 tools/travis/travis-fold.js                   |   8 +
 tools/tree-shaking-test/rollup.config.js      |  15 +-
 72 files changed, 1165 insertions(+), 945 deletions(-)

diff --git a/browser-providers.conf.js b/browser-providers.conf.js
index 4b6f079f1cff..5e75463f1290 100644
--- a/browser-providers.conf.js
+++ b/browser-providers.conf.js
@@ -1,242 +1,98 @@
-// Unique place to configure the browsers which are used in the different CI jobs in Sauce Labs (SL) and BrowserStack (BS).
+/**
+ * @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
+ */
+
+// Unique place to configure the browsers which are used in the different CI jobs in Sauce Labs (SL)
+// and BrowserStack (BS).
 // If the target is set to null, then the browser is not run anywhere during CI.
-// If a category becomes empty (e.g. BS and required), then the corresponding job must be commented out in Travis configuration.
+// If a category becomes empty (e.g. BS and required), then the corresponding job must be commented
+// out in Travis configuration.
 var CIconfiguration = {
-  'Chrome':       { unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}},
-  'Firefox':      { unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}},
+  'Chrome': {unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}},
+  'Firefox': {unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}},
   // FirefoxBeta and ChromeBeta should be target:'BS' or target:'SL', and required:true
   // Currently deactivated due to https://github.com/angular/angular/issues/7560
-  'ChromeBeta':   { unitTest: {target: null, required: true}, e2e: {target: null, required: false}},
-  'FirefoxBeta':  { unitTest: {target: null, required: false}, e2e: {target: null, required: false}},
-  'ChromeDev':    { unitTest: {target: null, required: true}, e2e: {target: null, required: true}},
-  'FirefoxDev':   { unitTest: {target: null, required: true}, e2e: {target: null, required: true}},
-  'IE9':          { unitTest: {target: 'SL', required: false}, e2e: {target: null, required: true}},
-  'IE10':         { unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}},
-  'IE11':         { unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}},
-  'Edge':         { unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}},
-  'Android4.1':   { unitTest: {target: 'SL', required: false}, e2e: {target: null, required: true}},
-  'Android4.2':   { unitTest: {target: 'SL', required: false}, e2e: {target: null, required: true}},
-  'Android4.3':   { unitTest: {target: 'SL', required: false}, e2e: {target: null, required: true}},
-  'Android4.4':   { unitTest: {target: 'SL', required: false}, e2e: {target: null, required: true}},
-  'Android5':     { unitTest: {target: 'SL', required: false}, e2e: {target: null, required: true}},
-  'Safari7':      { unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}},
-  'Safari8':      { unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}},
-  'Safari9':      { unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}},
-  'Safari10':     { unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}},
-  'iOS7':         { unitTest: {target: 'BS', required: true}, e2e: {target: null, required: true}},
-  'iOS8':         { unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}},
-  'iOS9':         { unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}},
-  'iOS10':        { unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}},
-  'WindowsPhone': { unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}}
+  'ChromeBeta': {unitTest: {target: null, required: true}, e2e: {target: null, required: false}},
+  'FirefoxBeta': {unitTest: {target: null, required: false}, e2e: {target: null, required: false}},
+  'ChromeDev': {unitTest: {target: null, required: true}, e2e: {target: null, required: true}},
+  'FirefoxDev': {unitTest: {target: null, required: true}, e2e: {target: null, required: true}},
+  'IE9': {unitTest: {target: 'SL', required: false}, e2e: {target: null, required: true}},
+  'IE10': {unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}},
+  'IE11': {unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}},
+  'Edge': {unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}},
+  'Android4.1': {unitTest: {target: 'SL', required: false}, e2e: {target: null, required: true}},
+  'Android4.2': {unitTest: {target: 'SL', required: false}, e2e: {target: null, required: true}},
+  'Android4.3': {unitTest: {target: 'SL', required: false}, e2e: {target: null, required: true}},
+  'Android4.4': {unitTest: {target: 'SL', required: false}, e2e: {target: null, required: true}},
+  'Android5': {unitTest: {target: 'SL', required: false}, e2e: {target: null, required: true}},
+  'Safari7': {unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}},
+  'Safari8': {unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}},
+  'Safari9': {unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}},
+  'Safari10': {unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}},
+  'iOS7': {unitTest: {target: 'BS', required: true}, e2e: {target: null, required: true}},
+  'iOS8': {unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}},
+  'iOS9': {unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}},
+  'iOS10': {unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}},
+  'WindowsPhone': {unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}}
 };
 
 var customLaunchers = {
-  'DartiumWithWebPlatform': {
-    base: 'Dartium',
-    flags: ['--enable-experimental-web-platform-features'] },
-  'ChromeNoSandbox': {
-    base: 'Chrome',
-    flags: ['--no-sandbox'] },
-  'SL_CHROME': {
-    base: 'SauceLabs',
-    browserName: 'chrome',
-    version: '52'
-  },
-  'SL_CHROMEBETA': {
-    base: 'SauceLabs',
-    browserName: 'chrome',
-    version: 'beta'
-  },
-  'SL_CHROMEDEV': {
-    base: 'SauceLabs',
-    browserName: 'chrome',
-    version: 'dev'
-  },
-  'SL_FIREFOX': {
-    base: 'SauceLabs',
-    browserName: 'firefox',
-    version: '46'
-  },
-  'SL_FIREFOXBETA': {
-    base: 'SauceLabs',
-    browserName: 'firefox',
-    version: 'beta'
-  },
-  'SL_FIREFOXDEV': {
-    base: 'SauceLabs',
-    browserName: 'firefox',
-    version: 'dev'
-  },
-  'SL_SAFARI7': {
-    base: 'SauceLabs',
-    browserName: 'safari',
-    platform: 'OS X 10.9',
-    version: '7.0'
-  },
-  'SL_SAFARI8': {
-    base: 'SauceLabs',
-    browserName: 'safari',
-    platform: 'OS X 10.10',
-    version: '8.0'
-  },
-  'SL_SAFARI9': {
-    base: 'SauceLabs',
-    browserName: 'safari',
-    platform: 'OS X 10.11',
-    version: '9.0'
-  },
-  'SL_SAFARI10': {
-    base: 'SauceLabs',
-    browserName: 'safari',
-    platform: 'OS X 10.12',
-    version: '10.0'
-  },
-  'SL_IOS7': {
-    base: 'SauceLabs',
-    browserName: 'iphone',
-    platform: 'OS X 10.10',
-    version: '7.1'
-  },
-  'SL_IOS8': {
-    base: 'SauceLabs',
-    browserName: 'iphone',
-    platform: 'OS X 10.10',
-    version: '8.4'
-  },
-  'SL_IOS9': {
-    base: 'SauceLabs',
-    browserName: 'iphone',
-    platform: 'OS X 10.10',
-    version: '9.3'
-  },
-  'SL_IOS10': {
-    base: 'SauceLabs',
-    browserName: 'iphone',
-    platform: 'OS X 10.10',
-    version: '10.0'
-  },
-  'SL_IE9': {
-    base: 'SauceLabs',
-    browserName: 'internet explorer',
-    platform: 'Windows 2008',
-    version: '9'
-  },
+  'DartiumWithWebPlatform':
+      {base: 'Dartium', flags: ['--enable-experimental-web-platform-features']},
+  'ChromeNoSandbox': {base: 'Chrome', flags: ['--no-sandbox']},
+  'SL_CHROME': {base: 'SauceLabs', browserName: 'chrome', version: '52'},
+  'SL_CHROMEBETA': {base: 'SauceLabs', browserName: 'chrome', version: 'beta'},
+  'SL_CHROMEDEV': {base: 'SauceLabs', browserName: 'chrome', version: 'dev'},
+  'SL_FIREFOX': {base: 'SauceLabs', browserName: 'firefox', version: '46'},
+  'SL_FIREFOXBETA': {base: 'SauceLabs', browserName: 'firefox', version: 'beta'},
+  'SL_FIREFOXDEV': {base: 'SauceLabs', browserName: 'firefox', version: 'dev'},
+  'SL_SAFARI7': {base: 'SauceLabs', browserName: 'safari', platform: 'OS X 10.9', version: '7.0'},
+  'SL_SAFARI8': {base: 'SauceLabs', browserName: 'safari', platform: 'OS X 10.10', version: '8.0'},
+  'SL_SAFARI9': {base: 'SauceLabs', browserName: 'safari', platform: 'OS X 10.11', version: '9.0'},
+  'SL_SAFARI10':
+      {base: 'SauceLabs', browserName: 'safari', platform: 'OS X 10.12', version: '10.0'},
+  'SL_IOS7': {base: 'SauceLabs', browserName: 'iphone', platform: 'OS X 10.10', version: '7.1'},
+  'SL_IOS8': {base: 'SauceLabs', browserName: 'iphone', platform: 'OS X 10.10', version: '8.4'},
+  'SL_IOS9': {base: 'SauceLabs', browserName: 'iphone', platform: 'OS X 10.10', version: '9.3'},
+  'SL_IOS10': {base: 'SauceLabs', browserName: 'iphone', platform: 'OS X 10.10', version: '10.0'},
+  'SL_IE9':
+      {base: 'SauceLabs', browserName: 'internet explorer', platform: 'Windows 2008', version: '9'},
   'SL_IE10': {
     base: 'SauceLabs',
     browserName: 'internet explorer',
     platform: 'Windows 2012',
     version: '10'
   },
-  'SL_IE11': {
-    base: 'SauceLabs',
-    browserName: 'internet explorer',
-    platform: 'Windows 8.1',
-    version: '11'
-  },
+  'SL_IE11':
+      {base: 'SauceLabs', browserName: 'internet explorer', platform: 'Windows 8.1', version: '11'},
   'SL_EDGE': {
     base: 'SauceLabs',
     browserName: 'MicrosoftEdge',
     platform: 'Windows 10',
     version: '13.10586'
   },
-  'SL_ANDROID4.1': {
-    base: 'SauceLabs',
-    browserName: 'android',
-    platform: 'Linux',
-    version: '4.1'
-  },
-  'SL_ANDROID4.2': {
-    base: 'SauceLabs',
-    browserName: 'android',
-    platform: 'Linux',
-    version: '4.2'
-  },
-  'SL_ANDROID4.3': {
-    base: 'SauceLabs',
-    browserName: 'android',
-    platform: 'Linux',
-    version: '4.3'
-  },
-  'SL_ANDROID4.4': {
-    base: 'SauceLabs',
-    browserName: 'android',
-    platform: 'Linux',
-    version: '4.4'
-  },
-  'SL_ANDROID5': {
-    base: 'SauceLabs',
-    browserName: 'android',
-    platform: 'Linux',
-    version: '5.1'
-  },
+  'SL_ANDROID4.1': {base: 'SauceLabs', browserName: 'android', platform: 'Linux', version: '4.1'},
+  'SL_ANDROID4.2': {base: 'SauceLabs', browserName: 'android', platform: 'Linux', version: '4.2'},
+  'SL_ANDROID4.3': {base: 'SauceLabs', browserName: 'android', platform: 'Linux', version: '4.3'},
+  'SL_ANDROID4.4': {base: 'SauceLabs', browserName: 'android', platform: 'Linux', version: '4.4'},
+  'SL_ANDROID5': {base: 'SauceLabs', browserName: 'android', platform: 'Linux', version: '5.1'},
 
-  'BS_CHROME': {
-    base: 'BrowserStack',
-    browser: 'chrome',
-    os: 'OS X',
-    os_version: 'Yosemite'
-  },
-  'BS_FIREFOX': {
-    base: 'BrowserStack',
-    browser: 'firefox',
-    os: 'Windows',
-    os_version: '10'
-  },
-  'BS_SAFARI7': {
-    base: 'BrowserStack',
-    browser: 'safari',
-    os: 'OS X',
-    os_version: 'Mavericks'
-  },
-  'BS_SAFARI8': {
-    base: 'BrowserStack',
-    browser: 'safari',
-    os: 'OS X',
-    os_version: 'Yosemite'
-  },
-  'BS_SAFARI9': {
-    base: 'BrowserStack',
-    browser: 'safari',
-    os: 'OS X',
-    os_version: 'El Capitan'
-  },
-  'BS_SAFARI10': {
-    base: 'BrowserStack',
-    browser: 'safari',
-    os: 'OS X',
-    os_version: 'Sierra'
-  },
-  'BS_IOS7': {
-    base: 'BrowserStack',
-    device: 'iPhone 5S',
-    os: 'ios',
-    os_version: '7.0'
-  },
-  'BS_IOS8': {
-    base: 'BrowserStack',
-    device: 'iPhone 6',
-    os: 'ios',
-    os_version: '8.3'
-  },
-  'BS_IOS9': {
-    base: 'BrowserStack',
-    device: 'iPhone 6S',
-    os: 'ios',
-    os_version: '9.1'
-  },
-  'BS_IOS10': {
-    base: 'BrowserStack',
-    device: 'iPhone SE',
-    os: 'ios',
-    os_version: '10.0'
-  },
-  'BS_IE9': {
-    base: 'BrowserStack',
-    browser: 'ie',
-    browser_version: '9.0',
-    os: 'Windows',
-    os_version: '7'
-  },
+  'BS_CHROME': {base: 'BrowserStack', browser: 'chrome', os: 'OS X', os_version: 'Yosemite'},
+  'BS_FIREFOX': {base: 'BrowserStack', browser: 'firefox', os: 'Windows', os_version: '10'},
+  'BS_SAFARI7': {base: 'BrowserStack', browser: 'safari', os: 'OS X', os_version: 'Mavericks'},
+  'BS_SAFARI8': {base: 'BrowserStack', browser: 'safari', os: 'OS X', os_version: 'Yosemite'},
+  'BS_SAFARI9': {base: 'BrowserStack', browser: 'safari', os: 'OS X', os_version: 'El Capitan'},
+  'BS_SAFARI10': {base: 'BrowserStack', browser: 'safari', os: 'OS X', os_version: 'Sierra'},
+  'BS_IOS7': {base: 'BrowserStack', device: 'iPhone 5S', os: 'ios', os_version: '7.0'},
+  'BS_IOS8': {base: 'BrowserStack', device: 'iPhone 6', os: 'ios', os_version: '8.3'},
+  'BS_IOS9': {base: 'BrowserStack', device: 'iPhone 6S', os: 'ios', os_version: '9.1'},
+  'BS_IOS10': {base: 'BrowserStack', device: 'iPhone SE', os: 'ios', os_version: '10.0'},
+  'BS_IE9':
+      {base: 'BrowserStack', browser: 'ie', browser_version: '9.0', os: 'Windows', os_version: '7'},
   'BS_IE10': {
     base: 'BrowserStack',
     browser: 'ie',
@@ -251,54 +107,31 @@ var customLaunchers = {
     os: 'Windows',
     os_version: '10'
   },
-  'BS_EDGE': {
-    base: 'BrowserStack',
-    browser: 'edge',
-    os: 'Windows',
-    os_version: '10'
-  },
-  'BS_WINDOWSPHONE' : {
-    base: 'BrowserStack',
-    device: 'Nokia Lumia 930',
-    os: 'winphone',
-    os_version: '8.1'
-  },
-  'BS_ANDROID5': {
-    base: 'BrowserStack',
-    device: 'Google Nexus 5',
-    os: 'android',
-    os_version: '5.0'
-  },
-  'BS_ANDROID4.4': {
-    base: 'BrowserStack',
-    device: 'HTC One M8',
-    os: 'android',
-    os_version: '4.4'
-  },
-  'BS_ANDROID4.3': {
-    base: 'BrowserStack',
-    device: 'Samsung Galaxy S4',
-    os: 'android',
-    os_version: '4.3'
-  },
-  'BS_ANDROID4.2': {
-    base: 'BrowserStack',
-    device: 'Google Nexus 4',
-    os: 'android',
-    os_version: '4.2'
-  },
-  'BS_ANDROID4.1': {
-    base: 'BrowserStack',
-    device: 'Google Nexus 7',
-    os: 'android',
-    os_version: '4.1'
-  }
+  'BS_EDGE': {base: 'BrowserStack', browser: 'edge', os: 'Windows', os_version: '10'},
+  'BS_WINDOWSPHONE':
+      {base: 'BrowserStack', device: 'Nokia Lumia 930', os: 'winphone', os_version: '8.1'},
+  'BS_ANDROID5': {base: 'BrowserStack', device: 'Google Nexus 5', os: 'android', os_version: '5.0'},
+  'BS_ANDROID4.4': {base: 'BrowserStack', device: 'HTC One M8', os: 'android', os_version: '4.4'},
+  'BS_ANDROID4.3':
+      {base: 'BrowserStack', device: 'Samsung Galaxy S4', os: 'android', os_version: '4.3'},
+  'BS_ANDROID4.2':
+      {base: 'BrowserStack', device: 'Google Nexus 4', os: 'android', os_version: '4.2'},
+  'BS_ANDROID4.1':
+      {base: 'BrowserStack', device: 'Google Nexus 7', os: 'android', os_version: '4.1'}
 };
 
 var sauceAliases = {
-  'ALL': Object.keys(customLaunchers).filter(function(item) {return customLaunchers[item].base == 'SauceLabs';}),
-  'DESKTOP': ['SL_CHROME', 'SL_FIREFOX', 'SL_IE9', 'SL_IE10', 'SL_IE11', 'SL_EDGE', 'SL_SAFARI7', 'SL_SAFARI8', 'SL_SAFARI9', 'SL_SAFARI10'],
-  'MOBILE': ['SL_ANDROID4.1', 'SL_ANDROID4.2', 'SL_ANDROID4.3', 'SL_ANDROID4.4', 'SL_ANDROID5', 'SL_IOS7', 'SL_IOS8', 'SL_IOS9', 'SL_IOS10'],
+  'ALL': Object.keys(customLaunchers).filter(function(item) {
+    return customLaunchers[item].base == 'SauceLabs';
+  }),
+  'DESKTOP': [
+    'SL_CHROME', 'SL_FIREFOX', 'SL_IE9', 'SL_IE10', 'SL_IE11', 'SL_EDGE', 'SL_SAFARI7',
+    'SL_SAFARI8', 'SL_SAFARI9', 'SL_SAFARI10'
+  ],
+  'MOBILE': [
+    'SL_ANDROID4.1', 'SL_ANDROID4.2', 'SL_ANDROID4.3', 'SL_ANDROID4.4', 'SL_ANDROID5', 'SL_IOS7',
+    'SL_IOS8', 'SL_IOS9', 'SL_IOS10'
+  ],
   'ANDROID': ['SL_ANDROID4.1', 'SL_ANDROID4.2', 'SL_ANDROID4.3', 'SL_ANDROID4.4', 'SL_ANDROID5'],
   'IE': ['SL_IE9', 'SL_IE10', 'SL_IE11'],
   'IOS': ['SL_IOS7', 'SL_IOS8', 'SL_IOS9', 'SL_IOS10'],
@@ -310,9 +143,16 @@ var sauceAliases = {
 };
 
 var browserstackAliases = {
-  'ALL': Object.keys(customLaunchers).filter(function(item) {return customLaunchers[item].base == 'BrowserStack';}),
-  'DESKTOP': ['BS_CHROME', 'BS_FIREFOX', 'BS_IE9', 'BS_IE10', 'BS_IE11', 'BS_EDGE', 'BS_SAFARI7', 'BS_SAFARI8', 'BS_SAFARI9', 'BS_SAFARI10'],
-  'MOBILE': ['BS_ANDROID4.3', 'BS_ANDROID4.4', 'BS_IOS7', 'BS_IOS8', 'BS_IOS9', 'BS_IOS10', 'BS_WINDOWSPHONE'],
+  'ALL': Object.keys(customLaunchers).filter(function(item) {
+    return customLaunchers[item].base == 'BrowserStack';
+  }),
+  'DESKTOP': [
+    'BS_CHROME', 'BS_FIREFOX', 'BS_IE9', 'BS_IE10', 'BS_IE11', 'BS_EDGE', 'BS_SAFARI7',
+    'BS_SAFARI8', 'BS_SAFARI9', 'BS_SAFARI10'
+  ],
+  'MOBILE': [
+    'BS_ANDROID4.3', 'BS_ANDROID4.4', 'BS_IOS7', 'BS_IOS8', 'BS_IOS9', 'BS_IOS10', 'BS_WINDOWSPHONE'
+  ],
   'ANDROID': ['BS_ANDROID4.3', 'BS_ANDROID4.4'],
   'IE': ['BS_IE9', 'BS_IE10', 'BS_IE11'],
   'IOS': ['BS_IOS7', 'BS_IOS8', 'BS_IOS9', 'BS_IOS10'],
@@ -329,9 +169,9 @@ module.exports = {
 
 function buildConfiguration(type, target, required) {
   return Object.keys(CIconfiguration)
-    .filter((item) => {
-      var conf = CIconfiguration[item][type];
-      return conf.required === required && conf.target === target;
-    })
-    .map((item) => target + '_' + item.toUpperCase());
+      .filter((item) => {
+        var conf = CIconfiguration[item][type];
+        return conf.required === required && conf.target === target;
+      })
+      .map((item) => target + '_' + item.toUpperCase());
 }
diff --git a/gulpfile.js b/gulpfile.js
index 99abcbec26c1..ce41eeeb2921 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,3 +1,11 @@
+/**
+ * @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
+ */
+
 'use strict';
 
 // THIS CHECK SHOULD BE THE FIRST THING IN THIS FILE
@@ -13,12 +21,14 @@ const os = require('os');
 
 // clang-format entry points
 const srcsToFmt = [
-  'modules/@angular/**/*.ts',
-  'modules/benchmarks/**/*.ts',
-  'modules/e2e_util/**/*.ts',
-  'modules/playground/**/*.ts',
-  'tools/**/*.ts',
+  'modules/@angular/**/*.{js,ts}',
+  'modules/benchmarks/**/*.{js,ts}',
+  'modules/e2e_util/**/*.{js,ts}',
+  'modules/playground/**/*.{js,ts}',
+  'tools/**/*.{js,ts}',
   '!tools/public_api_guard/**/*.d.ts',
+  './*.{js,ts}',
+  '!shims_for_IE.js',
 ];
 
 // Check source code for formatting errors (clang-format)
@@ -26,15 +36,16 @@ gulp.task('format:enforce', () => {
   const format = require('gulp-clang-format');
   const clangFormat = require('clang-format');
   return gulp.src(srcsToFmt).pipe(
-    format.checkFormat('file', clangFormat, {verbose: true, fail: true}));
+      format.checkFormat('file', clangFormat, {verbose: true, fail: true}));
 });
 
 // Format the source code with clang-format (see .clang-format)
 gulp.task('format', () => {
   const format = require('gulp-clang-format');
   const clangFormat = require('clang-format');
-  return gulp.src(srcsToFmt, { base: '.' }).pipe(
-    format.format('file', clangFormat)).pipe(gulp.dest('.'));
+  return gulp.src(srcsToFmt, {base: '.'})
+      .pipe(format.format('file', clangFormat))
+      .pipe(gulp.dest('.'));
 });
 
 const entrypoints = [
@@ -62,12 +73,18 @@ const entrypoints = [
 ];
 const publicApiDir = path.normalize('tools/public_api_guard');
 const publicApiArgs = [
-  '--rootDir', 'dist/packages-dist',
-  '--stripExportPattern', '^__',
-  '--allowModuleIdentifiers', 'jasmine',
-  '--allowModuleIdentifiers', 'protractor',
-  '--allowModuleIdentifiers', 'angular',
-  '--onStabilityMissing', 'error',
+  '--rootDir',
+  'dist/packages-dist',
+  '--stripExportPattern',
+  '^__',
+  '--allowModuleIdentifiers',
+  'jasmine',
+  '--allowModuleIdentifiers',
+  'protractor',
+  '--allowModuleIdentifiers',
+  'angular',
+  '--onStabilityMissing',
+  'error',
 ].concat(entrypoints);
 
 // Build angular
@@ -83,17 +100,17 @@ gulp.task('public-api:enforce', (done) => {
   const childProcess = require('child_process');
 
   childProcess
-    .spawn(
-      path.join(__dirname, platformScriptPath(`/node_modules/.bin/ts-api-guardian`)),
-      ['--verifyDir', publicApiDir].concat(publicApiArgs), {stdio: 'inherit'})
-    .on('close', (errorCode) => {
-      if (errorCode !== 0) {
-        done(new Error(
-          'Public API differs from golden file. Please run `gulp public-api:update`.'));
-      } else {
-        done();
-      }
-    });
+      .spawn(
+          path.join(__dirname, platformScriptPath(`/node_modules/.bin/ts-api-guardian`)),
+          ['--verifyDir', publicApiDir].concat(publicApiArgs), {stdio: 'inherit'})
+      .on('close', (errorCode) => {
+        if (errorCode !== 0) {
+          done(new Error(
+              'Public API differs from golden file. Please run `gulp public-api:update`.'));
+        } else {
+          done();
+        }
+      });
 });
 
 // Generate the public API golden files
@@ -101,20 +118,24 @@ gulp.task('public-api:update', ['build.sh'], (done) => {
   const childProcess = require('child_process');
 
   childProcess
-    .spawn(
-      path.join(__dirname, platformScriptPath(`/node_modules/.bin/ts-api-guardian`)),
-      ['--outDir', publicApiDir].concat(publicApiArgs), {stdio: 'inherit'})
-    .on('close', done);
+      .spawn(
+          path.join(__dirname, platformScriptPath(`/node_modules/.bin/ts-api-guardian`)),
+          ['--outDir', publicApiDir].concat(publicApiArgs), {stdio: 'inherit'})
+      .on('close', done);
 });
 
-// Checks tests for presence of ddescribe, fdescribe, fit, iit and fails the build if one of the focused tests is found.
-// Currently xdescribe and xit are _not_ reported as errors since there are a couple of excluded tests in our code base.
+// Checks tests for presence of ddescribe, fdescribe, fit, iit and fails the build if one of the
+// focused tests is found.
+// Currently xdescribe and xit are _not_ reported as errors since there are a couple of excluded
+// tests in our code base.
 gulp.task('check-tests', function() {
   const ddescribeIit = require('gulp-ddescribe-iit');
-  return gulp.src([
-    'modules/**/*.spec.ts',
-    'modules/**/*_spec.ts',
-  ]).pipe(ddescribeIit({allowDisabledTests: true}));
+  return gulp
+      .src([
+        'modules/**/*.spec.ts',
+        'modules/**/*_spec.ts',
+      ])
+      .pipe(ddescribeIit({allowDisabledTests: true}));
 });
 
 // Check the coding standards and programming errors
@@ -123,14 +144,21 @@ gulp.task('lint', ['check-tests', 'format:enforce', 'tools:build'], () => {
   // Built-in rules are at
   // https://github.com/palantir/tslint#supported-rules
   const tslintConfig = require('./tslint.json');
-  return gulp.src(['modules/@angular/**/*.ts', 'modules/benchpress/**/*.ts'])
-    .pipe(tslint({
-      tslint: require('tslint').default,
-      configuration: tslintConfig,
-      rulesDirectory: 'dist/tools/tslint',
-      formatter: 'prose',
-    }))
-    .pipe(tslint.report({emitError: true}));
+  return gulp
+      .src([
+        // todo(vicb): add .js files when supported
+        // see https://github.com/palantir/tslint/pull/1515
+        'modules/@angular/**/*.ts',
+        'modules/benchpress/**/*.ts',
+        './*.ts',
+      ])
+      .pipe(tslint({
+        tslint: require('tslint').default,
+        configuration: tslintConfig,
+        rulesDirectory: 'dist/tools/tslint',
+        formatter: 'prose',
+      }))
+      .pipe(tslint.report({emitError: true}));
 });
 
 gulp.task('tools:build', (done) => { tsc('tools/', done); });
@@ -142,7 +170,7 @@ gulp.task('check-cycle', (done) => {
   const dependencyObject = madge(['dist/all/'], {
     format: 'cjs',
     extensions: ['.js'],
-    onParseFile: function(data) { data.src = data.src.replace(/\/\* circular \*\//g, "//"); }
+    onParseFile: function(data) { data.src = data.src.replace(/\/\* circular \*\//g, '//'); }
   });
   const circularDependencies = dependencyObject.circular().getArray();
   if (circularDependencies.length > 0) {
@@ -173,11 +201,11 @@ gulp.task('serve-examples', () => {
   const cors = require('cors');
 
   connect.server({
-      root: `${__dirname}/dist/examples`,
-      port: 8001,
-      livereload: false,
-      open: false,
-      middleware: (connect, opt) => [cors()],
+    root: `${__dirname}/dist/examples`,
+    port: 8001,
+    livereload: false,
+    open: false,
+    middleware: (connect, opt) => [cors()],
   });
 });
 
@@ -187,16 +215,13 @@ gulp.task('changelog', () => {
   const conventionalChangelog = require('gulp-conventional-changelog');
 
   return gulp.src('CHANGELOG.md')
-    .pipe(conventionalChangelog({
-      preset: 'angular',
-      releaseCount: 1
-    }, {
-      // Conventional Changelog Context
-      // We have to manually set version number so it doesn't get prefixed with `v`
-      // See https://github.com/conventional-changelog/conventional-changelog-core/issues/10
-      currentTag: require('./package.json').version
-    }))
-    .pipe(gulp.dest('./'));
+      .pipe(conventionalChangelog({preset: 'angular', releaseCount: 1}, {
+        // Conventional Changelog Context
+        // We have to manually set version number so it doesn't get prefixed with `v`
+        // See https://github.com/conventional-changelog/conventional-changelog-core/issues/10
+        currentTag: require('./package.json').version
+      }))
+      .pipe(gulp.dest('./'));
 });
 
 function tsc(projectPath, done) {
@@ -205,8 +230,7 @@ function tsc(projectPath, done) {
   childProcess
       .spawn(
           path.normalize(platformScriptPath(`${__dirname}/node_modules/.bin/tsc`)),
-          ['-p', path.join(__dirname, projectPath)],
-          {stdio: 'inherit'})
+          ['-p', path.join(__dirname, projectPath)], {stdio: 'inherit'})
       .on('close', done);
 }
 
diff --git a/karma-js.conf.js b/karma-js.conf.js
index 7a4d3cedc12a..443bf417df4e 100644
--- a/karma-js.conf.js
+++ b/karma-js.conf.js
@@ -1,3 +1,11 @@
+/**
+ * @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
+ */
+
 var browserProvidersConf = require('./browser-providers.conf.js');
 var internalAngularReporter = require('./tools/karma/reporter.js');
 
@@ -17,24 +25,25 @@ module.exports = function(config) {
       // include Angular v1 for upgrade module testing
       'node_modules/angular/angular.min.js',
 
-      'node_modules/zone.js/dist/zone.js',
-      'node_modules/zone.js/dist/long-stack-trace-zone.js',
-      'node_modules/zone.js/dist/proxy.js',
-      'node_modules/zone.js/dist/sync-test.js',
-      'node_modules/zone.js/dist/jasmine-patch.js',
-      'node_modules/zone.js/dist/async-test.js',
+      'node_modules/zone.js/dist/zone.js', 'node_modules/zone.js/dist/long-stack-trace-zone.js',
+      'node_modules/zone.js/dist/proxy.js', 'node_modules/zone.js/dist/sync-test.js',
+      'node_modules/zone.js/dist/jasmine-patch.js', 'node_modules/zone.js/dist/async-test.js',
       'node_modules/zone.js/dist/fake-async-test.js',
 
       // Including systemjs because it defines `__eval`, which produces correct stack traces.
-      'shims_for_IE.js',
-      'node_modules/systemjs/dist/system.src.js',
+      'shims_for_IE.js', 'node_modules/systemjs/dist/system.src.js',
       {pattern: 'node_modules/rxjs/**', included: false, watched: false, served: true},
-      'node_modules/reflect-metadata/Reflect.js',
-      'tools/build/file2modulename.js',
-      'test-main.js',
-      {pattern: 'dist/all/empty.*', included: false, watched: false},
-      {pattern: 'modules/@angular/platform-browser/test/static_assets/**', included: false, watched: false},
-      {pattern: 'modules/@angular/platform-browser/test/browser/static_assets/**', included: false, watched: false}
+      'node_modules/reflect-metadata/Reflect.js', 'tools/build/file2modulename.js', 'test-main.js',
+      {pattern: 'dist/all/empty.*', included: false, watched: false}, {
+        pattern: 'modules/@angular/platform-browser/test/static_assets/**',
+        included: false,
+        watched: false
+      },
+      {
+        pattern: 'modules/@angular/platform-browser/test/browser/static_assets/**',
+        included: false,
+        watched: false,
+      }
     ],
 
     exclude: [
@@ -44,7 +53,7 @@ module.exports = function(config) {
       'dist/all/@angular/benchpress/**',
       'dist/all/angular1_router.js',
       'dist/all/@angular/platform-browser/testing/e2e_util.js',
-      'dist/examples/**/e2e_test/**'
+      'dist/examples/**/e2e_test/**',
     ],
 
     customLaunchers: browserProvidersConf.customLaunchers,
@@ -55,11 +64,11 @@ module.exports = function(config) {
       'karma-sauce-launcher',
       'karma-chrome-launcher',
       'karma-sourcemap-loader',
-      internalAngularReporter
+      internalAngularReporter,
     ],
 
     preprocessors: {
-      '**/*.js': ['sourcemap']
+      '**/*.js': ['sourcemap'],
     },
 
     reporters: ['internal-angular'],
@@ -73,7 +82,7 @@ module.exports = function(config) {
         'selenium-version': '2.53.0',
         'command-timeout': 600,
         'idle-timeout': 600,
-        'max-duration': 5400
+        'max-duration': 5400,
       }
     },
 
@@ -82,20 +91,21 @@ module.exports = function(config) {
       startTunnel: false,
       retryLimit: 3,
       timeout: 600,
-      pollingTimeout: 10000
+      pollingTimeout: 10000,
     },
 
     browsers: ['Chrome'],
 
     port: 9876,
     captureTimeout: 60000,
-    browserDisconnectTimeout : 60000,
-    browserDisconnectTolerance : 3,
-    browserNoActivityTimeout : 60000,
+    browserDisconnectTimeout: 60000,
+    browserDisconnectTolerance: 3,
+    browserNoActivityTimeout: 60000,
   });
 
   if (process.env.TRAVIS) {
-    var buildId = 'TRAVIS #' + process.env.TRAVIS_BUILD_NUMBER + ' (' + process.env.TRAVIS_BUILD_ID + ')';
+    var buildId =
+        'TRAVIS #' + process.env.TRAVIS_BUILD_NUMBER + ' (' + process.env.TRAVIS_BUILD_ID + ')';
     if (process.env.CI_MODE.startsWith('saucelabs')) {
       config.sauceLabs.build = buildId;
       config.sauceLabs.tunnelIdentifier = process.env.TRAVIS_JOB_NUMBER;
diff --git a/modules/@angular/common/rollup-testing.config.js b/modules/@angular/common/rollup-testing.config.js
index 3a0e5d02362f..8c0e1d761806 100644
--- a/modules/@angular/common/rollup-testing.config.js
+++ b/modules/@angular/common/rollup-testing.config.js
@@ -1,3 +1,10 @@
+/**
+ * @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
+ */
 
 export default {
   entry: '../../../dist/packages-dist/common/testing/index.js',
@@ -10,4 +17,4 @@ export default {
     'rxjs/Observable': 'Rx',
     'rxjs/Subject': 'Rx'
   }
-}
+};
diff --git a/modules/@angular/common/rollup.config.js b/modules/@angular/common/rollup.config.js
index 0ff5c1a5df9a..1e6b494fc8e4 100644
--- a/modules/@angular/common/rollup.config.js
+++ b/modules/@angular/common/rollup.config.js
@@ -1,3 +1,10 @@
+/**
+ * @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
+ */
 
 export default {
   entry: '../../../dist/packages-dist/common/index.js',
@@ -7,6 +14,6 @@ export default {
   globals: {
     '@angular/core': 'ng.core',
     'rxjs/Observable': 'Rx',
-    'rxjs/Subject': 'Rx'
+    'rxjs/Subject': 'Rx',
   }
-}
+};
diff --git a/modules/@angular/compiler-cli/integrationtest/webpack.config.js b/modules/@angular/compiler-cli/integrationtest/webpack.config.js
index 5478a9431cc2..90d348e286bc 100644
--- a/modules/@angular/compiler-cli/integrationtest/webpack.config.js
+++ b/modules/@angular/compiler-cli/integrationtest/webpack.config.js
@@ -1,10 +1,14 @@
+/**
+ * @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
+ */
+
 module.exports = {
   target: 'node',
   entry: './test/all_spec.js',
-  output: {
-    filename: './all_spec.js'
-  },
-  resolve: {
-    extensions: ['.js']
-  },
+  output: {filename: './all_spec.js'},
+  resolve: {extensions: ['.js']},
 };
diff --git a/modules/@angular/compiler/rollup-testing.config.js b/modules/@angular/compiler/rollup-testing.config.js
index dbc0d14d4e9b..8772530d02f6 100644
--- a/modules/@angular/compiler/rollup-testing.config.js
+++ b/modules/@angular/compiler/rollup-testing.config.js
@@ -1,3 +1,10 @@
+/**
+ * @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
+ */
 
 export default {
   entry: '../../../dist/packages-dist/compiler/testing/index.js',
@@ -11,4 +18,4 @@ export default {
     'rxjs/Observable': 'Rx',
     'rxjs/Subject': 'Rx'
   }
-}
+};
diff --git a/modules/@angular/compiler/rollup.config.js b/modules/@angular/compiler/rollup.config.js
index 3f6d4454907a..4aa577765164 100644
--- a/modules/@angular/compiler/rollup.config.js
+++ b/modules/@angular/compiler/rollup.config.js
@@ -1,3 +1,10 @@
+/**
+ * @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
+ */
 
 export default {
   entry: '../../../dist/packages-dist/compiler/index.js',
@@ -7,9 +14,9 @@ export default {
   globals: {
     '@angular/core': 'ng.core',
     'rxjs/Observable': 'Rx',
-    'rxjs/Subject': 'Rx'
+    'rxjs/Subject': 'Rx',
   },
   plugins: [
-//    nodeResolve({ jsnext: true, main: true }),
+    //    nodeResolve({ jsnext: true, main: true }),
   ]
-}
+};
diff --git a/modules/@angular/core/rollup-testing.config.js b/modules/@angular/core/rollup-testing.config.js
index 0d150b4c9249..bf27b75a402e 100644
--- a/modules/@angular/core/rollup-testing.config.js
+++ b/modules/@angular/core/rollup-testing.config.js
@@ -1,3 +1,10 @@
+/**
+ * @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
+ */
 
 export default {
   entry: '../../../dist/packages-dist/core/testing/index.js',
@@ -7,7 +14,6 @@ export default {
   globals: {
     '@angular/core': 'ng.core',
     'rxjs/Observable': 'Rx',
-    'rxjs/Subject': 'Rx'
+    'rxjs/Subject': 'Rx',
   }
-}
-
+};
diff --git a/modules/@angular/core/rollup.config.js b/modules/@angular/core/rollup.config.js
index 6e7fa74e72f3..c13b6b6f6b05 100644
--- a/modules/@angular/core/rollup.config.js
+++ b/modules/@angular/core/rollup.config.js
@@ -1,3 +1,10 @@
+/**
+ * @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
+ */
 
 export default {
   entry: '../../../dist/packages-dist/core/index.js',
@@ -6,7 +13,6 @@ export default {
   moduleName: 'ng.core',
   globals: {
     'rxjs/Observable': 'Rx',
-    'rxjs/Subject': 'Rx'
+    'rxjs/Subject': 'Rx',
   }
-}
-
+};
diff --git a/modules/@angular/forms/rollup.config.js b/modules/@angular/forms/rollup.config.js
index 10133a054edd..89990f851cf6 100644
--- a/modules/@angular/forms/rollup.config.js
+++ b/modules/@angular/forms/rollup.config.js
@@ -1,3 +1,10 @@
+/**
+ * @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
+ */
 
 export default {
   entry: '../../../dist/packages-dist/forms/index.js',
@@ -13,4 +20,4 @@ export default {
     'rxjs/observable/fromPromise': 'Rx.Observable',
     'rxjs/operator/toPromise': 'Rx.Observable.prototype'
   }
-}
+};
diff --git a/modules/@angular/http/rollup-testing.config.js b/modules/@angular/http/rollup-testing.config.js
index 8ca61d2efc96..52c320771603 100644
--- a/modules/@angular/http/rollup-testing.config.js
+++ b/modules/@angular/http/rollup-testing.config.js
@@ -1,3 +1,10 @@
+/**
+ * @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
+ */
 
 export default {
   entry: '../../../dist/packages-dist/http/testing/index.js',
@@ -14,4 +21,4 @@ export default {
     'rxjs/Subject': 'Rx',
     'rxjs/operator/take': 'Rx.Observable.prototype'
   }
-}
+};
diff --git a/modules/@angular/http/rollup.config.js b/modules/@angular/http/rollup.config.js
index 43fbb74359c9..69e786cdda9b 100644
--- a/modules/@angular/http/rollup.config.js
+++ b/modules/@angular/http/rollup.config.js
@@ -1,3 +1,10 @@
+/**
+ * @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
+ */
 
 export default {
   entry: '../../../dist/packages-dist/http/index.js',
@@ -11,4 +18,4 @@ export default {
     'rxjs/Observable': 'Rx',
     'rxjs/Subject': 'Rx'
   }
-}
+};
diff --git a/modules/@angular/platform-browser-dynamic/rollup-testing.config.js b/modules/@angular/platform-browser-dynamic/rollup-testing.config.js
index c78d0a4fb9b6..ca88ac7f5364 100644
--- a/modules/@angular/platform-browser-dynamic/rollup-testing.config.js
+++ b/modules/@angular/platform-browser-dynamic/rollup-testing.config.js
@@ -1,6 +1,15 @@
+/**
+ * @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
+ */
+
 export default {
   entry: '../../../dist/packages-dist/platform-browser-dynamic/testing/index.js',
-  dest: '../../../dist/packages-dist/platform-browser-dynamic/bundles/platform-browser-dynamic-testing.umd.js',
+  dest:
+      '../../../dist/packages-dist/platform-browser-dynamic/bundles/platform-browser-dynamic-testing.umd.js',
   format: 'umd',
   moduleName: 'ng.platformBrowserDynamic.testing',
   globals: {
@@ -13,4 +22,4 @@ export default {
     '@angular/platform-browser/testing': 'ng.platformBrowser.testing',
     '@angular/platform-browser-dynamic': 'ng.platformBrowserDynamic'
   }
-}
+};
diff --git a/modules/@angular/platform-browser-dynamic/rollup.config.js b/modules/@angular/platform-browser-dynamic/rollup.config.js
index ef9cc3e57626..03ed750040d4 100644
--- a/modules/@angular/platform-browser-dynamic/rollup.config.js
+++ b/modules/@angular/platform-browser-dynamic/rollup.config.js
@@ -1,12 +1,21 @@
+/**
+ * @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
+ */
+
 export default {
   entry: '../../../dist/packages-dist/platform-browser-dynamic/index.js',
-  dest: '../../../dist/packages-dist/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js',
+  dest:
+      '../../../dist/packages-dist/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js',
   format: 'umd',
   moduleName: 'ng.platformBrowserDynamic',
   globals: {
     '@angular/core': 'ng.core',
     '@angular/common': 'ng.common',
     '@angular/compiler': 'ng.compiler',
-    '@angular/platform-browser': 'ng.platformBrowser'
+    '@angular/platform-browser': 'ng.platformBrowser',
   }
-}
+};
diff --git a/modules/@angular/platform-browser/rollup-testing.config.js b/modules/@angular/platform-browser/rollup-testing.config.js
index 1a04170daee6..bd8fb0209489 100644
--- a/modules/@angular/platform-browser/rollup-testing.config.js
+++ b/modules/@angular/platform-browser/rollup-testing.config.js
@@ -1,3 +1,10 @@
+/**
+ * @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
+ */
 
 export default {
   entry: '../../../dist/packages-dist/platform-browser/testing/index.js',
@@ -9,4 +16,4 @@ export default {
     '@angular/common': 'ng.common',
     '@angular/platform-browser': 'ng.platformBrowser'
   }
-}
+};
diff --git a/modules/@angular/platform-browser/rollup.config.js b/modules/@angular/platform-browser/rollup.config.js
index 4e920200d526..a02654510aaa 100644
--- a/modules/@angular/platform-browser/rollup.config.js
+++ b/modules/@angular/platform-browser/rollup.config.js
@@ -1,3 +1,10 @@
+/**
+ * @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
+ */
 
 export default {
   entry: '../../../dist/packages-dist/platform-browser/index.js',
@@ -6,6 +13,6 @@ export default {
   moduleName: 'ng.platformBrowser',
   globals: {
     '@angular/core': 'ng.core',
-    '@angular/common': 'ng.common'
+    '@angular/common': 'ng.common',
   }
-}
+};
diff --git a/modules/@angular/platform-server/rollup-testing.config.js b/modules/@angular/platform-server/rollup-testing.config.js
index 8741bcaa212e..94b9763bf288 100644
--- a/modules/@angular/platform-server/rollup-testing.config.js
+++ b/modules/@angular/platform-server/rollup-testing.config.js
@@ -1,3 +1,10 @@
+/**
+ * @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
+ */
 
 export default {
   entry: '../../../dist/packages-dist/platform-server/testing/index.js',
@@ -13,4 +20,4 @@ export default {
     '@angular/platform-server': 'ng.platformServer',
     '@angular/platform-browser-dynamic/testing': 'ng.platformBrowserDynamic.testing'
   }
-}
+};
diff --git a/modules/@angular/platform-server/rollup.config.js b/modules/@angular/platform-server/rollup.config.js
index 345d5b37022c..99f753257ab1 100644
--- a/modules/@angular/platform-server/rollup.config.js
+++ b/modules/@angular/platform-server/rollup.config.js
@@ -1,3 +1,10 @@
+/**
+ * @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
+ */
 
 export default {
   entry: '../../../dist/packages-dist/platform-server/index.js',
@@ -10,4 +17,4 @@ export default {
     '@angular/compiler': 'ng.compiler',
     '@angular/platform-browser': 'ng.platformBrowser'
   }
-}
+};
diff --git a/modules/@angular/platform-webworker-dynamic/rollup.config.js b/modules/@angular/platform-webworker-dynamic/rollup.config.js
index 407844e271e6..f8b4a0f4d305 100644
--- a/modules/@angular/platform-webworker-dynamic/rollup.config.js
+++ b/modules/@angular/platform-webworker-dynamic/rollup.config.js
@@ -1,6 +1,15 @@
+/**
+ * @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
+ */
+
 export default {
   entry: '../../../dist/packages-dist/platform-webworker-dynamic/index.js',
-  dest: '../../../dist/packages-dist/platform-webworker-dynamic/bundles/platform-webworker-dynamic.umd.js',
+  dest:
+      '../../../dist/packages-dist/platform-webworker-dynamic/bundles/platform-webworker-dynamic.umd.js',
   format: 'umd',
   moduleName: 'ng.platformWebworkerDynamic',
   globals: {
@@ -9,6 +18,6 @@ export default {
     '@angular/compiler': 'ng.compiler',
     '@angular/platform-browser': 'ng.platformBrowser',
     '@angular/platform-browser-dynamic': 'ng.platformBrowserDynamic',
-    '@angular/platform-webworker': 'ng.platformWebworker'
+    '@angular/platform-webworker': 'ng.platformWebworker',
   }
-}
+};
diff --git a/modules/@angular/platform-webworker/rollup.config.js b/modules/@angular/platform-webworker/rollup.config.js
index cafbd1b9526c..c195c8be8324 100644
--- a/modules/@angular/platform-webworker/rollup.config.js
+++ b/modules/@angular/platform-webworker/rollup.config.js
@@ -1,3 +1,10 @@
+/**
+ * @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
+ */
 
 export default {
   entry: '../../../dist/packages-dist/platform-webworker/index.js',
@@ -11,4 +18,4 @@ export default {
     'rxjs/Observable': 'Rx',
     'rxjs/Subject': 'Rx'
   }
-}
+};
diff --git a/modules/@angular/router/karma-test-shim.js b/modules/@angular/router/karma-test-shim.js
index 9f84243e2b2d..9b71826f28c9 100644
--- a/modules/@angular/router/karma-test-shim.js
+++ b/modules/@angular/router/karma-test-shim.js
@@ -1,9 +1,16 @@
+/**
+ * @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
+ */
+
 /*global jasmine, __karma__, window*/
 Error.stackTraceLimit = 5;
 jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;
 
-__karma__.loaded = function () {
-};
+__karma__.loaded = function() {};
 
 function isJsFile(path) {
   return path.slice(-3) == '.js';
@@ -18,93 +25,50 @@ function isBuiltFile(path) {
   return isJsFile(path) && (path.substr(0, builtPath.length) == builtPath);
 }
 
-var allSpecFiles = Object.keys(window.__karma__.files)
-  .filter(isSpecFile)
-  .filter(isBuiltFile);
+var allSpecFiles = Object.keys(window.__karma__.files).filter(isSpecFile).filter(isBuiltFile);
 
 // Load our SystemJS configuration.
 System.config({
-  baseURL: '/base'
+  baseURL: '/base',
 });
 
-System.config(
-  {
-    map: {
-      'rxjs': 'node_modules/rxjs',
-      '@angular': 'dist/all/@angular'
-    },
-    packages: {
-      '@angular/core/testing': {
-        main: 'index.js',
-        defaultExtension: 'js'
-      },
-      '@angular/core': {
-        main: 'index.js',
-        defaultExtension: 'js'
-      },
-      '@angular/compiler/testing': {
-        main: 'index.js',
-        defaultExtension: 'js'
-      },
-      '@angular/compiler': {
-        main: 'index.js',
-        defaultExtension: 'js'
-      },
-      '@angular/common/testing': {
-        main: 'index.js',
-        defaultExtension: 'js'
-      },
-      '@angular/common': {
-        main: 'index.js',
-        defaultExtension: 'js'
-      },
-      '@angular/platform-browser/testing': {
-        main: 'index.js',
-        defaultExtension: 'js'
-      },
-      '@angular/platform-browser': {
-        main: 'index.js',
-        defaultExtension: 'js'
-      },
-      '@angular/platform-browser-dynamic/testing': {
-        main: 'index.js',
-        defaultExtension: 'js'
-      },
-      '@angular/platform-browser-dynamic': {
-        main: 'index.js',
-        defaultExtension: 'js'
-      },
-      '@angular/router/testing': {
-        main: 'index.js',
-        defaultExtension: 'js'
-      },
-      '@angular/router': {
-        main: 'index.js',
-        defaultExtension: 'js'
-      },
-      'rxjs': {
-        main: 'Rx.js',
-        defaultExtension: 'js'
-      }
-    }
-  });
+System.config({
+  map: {'rxjs': 'node_modules/rxjs', '@angular': 'dist/all/@angular'},
+  packages: {
+    '@angular/core/testing': {main: 'index.js', defaultExtension: 'js'},
+    '@angular/core': {main: 'index.js', defaultExtension: 'js'},
+    '@angular/compiler/testing': {main: 'index.js', defaultExtension: 'js'},
+    '@angular/compiler': {main: 'index.js', defaultExtension: 'js'},
+    '@angular/common/testing': {main: 'index.js', defaultExtension: 'js'},
+    '@angular/common': {main: 'index.js', defaultExtension: 'js'},
+    '@angular/platform-browser/testing': {main: 'index.js', defaultExtension: 'js'},
+    '@angular/platform-browser': {main: 'index.js', defaultExtension: 'js'},
+    '@angular/platform-browser-dynamic/testing': {main: 'index.js', defaultExtension: 'js'},
+    '@angular/platform-browser-dynamic': {main: 'index.js', defaultExtension: 'js'},
+    '@angular/router/testing': {main: 'index.js', defaultExtension: 'js'},
+    '@angular/router': {main: 'index.js', defaultExtension: 'js'},
+    'rxjs': {main: 'Rx.js', defaultExtension: 'js'},
+  }
+});
 
-Promise.all([
-  System.import('@angular/core/testing'),
-  System.import('@angular/platform-browser-dynamic/testing')
-]).then(function (providers) {
-  var testing = providers[0];
-  var testingBrowser = providers[1];
+Promise
+    .all([
+      System.import('@angular/core/testing'),
+      System.import('@angular/platform-browser-dynamic/testing')
+    ])
+    .then(function(providers) {
+      var testing = providers[0];
+      var testingBrowser = providers[1];
 
-  testing.TestBed.initTestEnvironment(
-    testingBrowser.BrowserDynamicTestingModule,
-    testingBrowser.platformBrowserDynamicTesting());
+      testing.TestBed.initTestEnvironment(
+          testingBrowser.BrowserDynamicTestingModule,
+          testingBrowser.platformBrowserDynamicTesting());
 
-}).then(function() {
-  // Finally, load all spec files.
-  // This will run the tests directly.
-  return Promise.all(
-    allSpecFiles.map(function (moduleName) {
-      return System.import(moduleName);
-    }));
-}).then(__karma__.start, __karma__.error);
+    })
+    .then(function() {
+      // Finally, load all spec files.
+      // This will run the tests directly.
+      return Promise.all(
+          allSpecFiles.map(function(moduleName) { return System.import(moduleName); }));
+    })
+    .then(__karma__.start, __karma__.error);
diff --git a/modules/@angular/router/karma.conf.js b/modules/@angular/router/karma.conf.js
index 4188df437a30..26812a70a7e2 100644
--- a/modules/@angular/router/karma.conf.js
+++ b/modules/@angular/router/karma.conf.js
@@ -1,3 +1,11 @@
+/**
+ * @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
+ */
+
 var browserProvidersConf = require('../../../browser-providers.conf.js');
 
 // Karma configuration
@@ -28,11 +36,11 @@ module.exports = function(config) {
       'node_modules/zone.js/dist/fake-async-test.js',
 
       // RxJs.
-      { pattern: 'node_modules/rxjs/**/*.js', included: false, watched: false },
-      { pattern: 'node_modules/rxjs/**/*.js.map', included: false, watched: false },
+      {pattern: 'node_modules/rxjs/**/*.js', included: false, watched: false},
+      {pattern: 'node_modules/rxjs/**/*.js.map', included: false, watched: false},
 
       // shim
-      {pattern: 'modules/@angular/router/karma-test-shim.js', included: true, watched: true },
+      {pattern: 'modules/@angular/router/karma-test-shim.js', included: true, watched: true},
 
       // Angular modules
       {pattern: 'dist/all/@angular/core/*.js', included: false, watched: false},
@@ -49,11 +57,23 @@ module.exports = function(config) {
 
       {pattern: 'dist/all/@angular/platform-browser/*.js', included: false, watched: false},
       {pattern: 'dist/all/@angular/platform-browser/src/**/*.js', included: false, watched: false},
-      {pattern: 'dist/all/@angular/platform-browser/testing/**/*.js', included: false, watched: false},
+      {
+        pattern: 'dist/all/@angular/platform-browser/testing/**/*.js',
+        included: false,
+        watched: false,
+      },
 
       {pattern: 'dist/all/@angular/platform-browser-dynamic/*.js', included: false, watched: false},
-      {pattern: 'dist/all/@angular/platform-browser-dynamic/src/**/*.js', included: false, watched: false},
-      {pattern: 'dist/all/@angular/platform-browser-dynamic/testing/**/*.js', included: false, watched: false},
+      {
+        pattern: 'dist/all/@angular/platform-browser-dynamic/src/**/*.js',
+        included: false,
+        watched: false,
+      },
+      {
+        pattern: 'dist/all/@angular/platform-browser-dynamic/testing/**/*.js',
+        included: false,
+        watched: false,
+      },
 
       // Router
       {pattern: 'dist/all/@angular/router/**/*.js', included: false, watched: true}
@@ -66,11 +86,11 @@ module.exports = function(config) {
       'karma-browserstack-launcher',
       'karma-sauce-launcher',
       'karma-chrome-launcher',
-      'karma-sourcemap-loader'
+      'karma-sourcemap-loader',
     ],
 
     preprocessors: {
-      '**/*.js': ['sourcemap']
+      '**/*.js': ['sourcemap'],
     },
 
     reporters: ['dots'],
@@ -81,8 +101,8 @@ module.exports = function(config) {
     browsers: ['Chrome'],
     singleRun: false,
     captureTimeout: 60000,
-    browserDisconnectTimeout : 60000,
-    browserDisconnectTolerance : 3,
-    browserNoActivityTimeout : 60000
+    browserDisconnectTimeout: 60000,
+    browserDisconnectTolerance: 3,
+    browserNoActivityTimeout: 60000,
   });
 };
diff --git a/modules/@angular/router/rollup-testing.config.js b/modules/@angular/router/rollup-testing.config.js
index 329907971d4b..1943b5793cd9 100644
--- a/modules/@angular/router/rollup-testing.config.js
+++ b/modules/@angular/router/rollup-testing.config.js
@@ -1,3 +1,11 @@
+/**
+ * @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
+ */
+
 export default {
   entry: '../../../dist/packages-dist/router/testing/index.js',
   dest: '../../../dist/packages-dist/router/bundles/router-testing.umd.js',
@@ -10,4 +18,4 @@ export default {
     '@angular/platform-browser': 'ng.platformBrowser',
     '@angular/router': 'ng.router'
   }
-}
+};
diff --git a/modules/@angular/router/rollup.config.js b/modules/@angular/router/rollup.config.js
index 3e52b6a40c1b..2d6906587c20 100644
--- a/modules/@angular/router/rollup.config.js
+++ b/modules/@angular/router/rollup.config.js
@@ -1,3 +1,11 @@
+/**
+ * @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
+ */
+
 export default {
   entry: '../../../dist/packages-dist/router/index.js',
   dest: '../../../dist/packages-dist/router/bundles/router.umd.js',
@@ -28,8 +36,7 @@ export default {
     'rxjs/operator/every': 'Rx.Observable.prototype',
     'rxjs/operator/first': 'Rx.Observable.prototype',
     'rxjs/operator/catch': 'Rx.Observable.prototype',
-    'rxjs/operator/last': 'Rx.Observable.prototype'
+    'rxjs/operator/last': 'Rx.Observable.prototype',
   },
-  plugins: [
-  ]
-}
+  plugins: []
+};
diff --git a/modules/@angular/upgrade/rollup.config.js b/modules/@angular/upgrade/rollup.config.js
index b14fc3c2c147..f02a7da579b5 100644
--- a/modules/@angular/upgrade/rollup.config.js
+++ b/modules/@angular/upgrade/rollup.config.js
@@ -1,3 +1,10 @@
+/**
+ * @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
+ */
 
 export default {
   entry: '../../../dist/packages-dist/upgrade/index.js',
@@ -11,8 +18,9 @@ export default {
     '@angular/platform-browser': 'ng.platformBrowser',
     '@angular/platform-browser-dynamic': 'ng.platformBrowserDynamic',
     'rxjs/Subject': 'Rx',
-    'rxjs/observable/PromiseObservable': 'Rx', // this is wrong, but this stuff has changed in rxjs b.6 so we need to fix it when we update.
+    'rxjs/observable/PromiseObservable': 'Rx',  // this is wrong, but this stuff has changed in rxjs
+                                                // b.6 so we need to fix it when we update.
     'rxjs/operator/toPromise': 'Rx.Observable.prototype',
-    'rxjs/Observable': 'Rx'
+    'rxjs/Observable': 'Rx',
   }
-}
+};
diff --git a/modules/angular1_router/build.js b/modules/angular1_router/build.js
index 993707498898..0c10a7ba6e1a 100644
--- a/modules/angular1_router/build.js
+++ b/modules/angular1_router/build.js
@@ -1,3 +1,11 @@
+/**
+ * @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
+ */
+
 'use strict';
 
 var fs = require('fs');
diff --git a/modules/angular1_router/karma-router.conf.js b/modules/angular1_router/karma-router.conf.js
index 128f839e5254..b5632d67ab26 100644
--- a/modules/angular1_router/karma-router.conf.js
+++ b/modules/angular1_router/karma-router.conf.js
@@ -1,3 +1,11 @@
+/**
+ * @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
+ */
+
 'use strict';
 
 var browserProvidersConf = require('../../browser-providers.conf.js');
diff --git a/modules/angular1_router/src/module_template.js b/modules/angular1_router/src/module_template.js
index f648cbce4219..61b49c409e2f 100644
--- a/modules/angular1_router/src/module_template.js
+++ b/modules/angular1_router/src/module_template.js
@@ -1,3 +1,10 @@
+/**
+ * @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
+ */
 
 angular.module('ngComponentRouter').
     value('$route', null). // can be overloaded with ngRouteShim
diff --git a/modules/angular1_router/src/ng_route_shim.js b/modules/angular1_router/src/ng_route_shim.js
index bdb29bf851a9..7bbef6a13bfd 100644
--- a/modules/angular1_router/src/ng_route_shim.js
+++ b/modules/angular1_router/src/ng_route_shim.js
@@ -1,4 +1,11 @@
-/** @license Copyright 2014-2016 Google, Inc. http://github.com/angular/angular/LICENSE */
+/**
+ * @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
+ */
+
 (function () {
 
   'use strict';
@@ -282,8 +289,8 @@
 
           var href = element.attr(hrefAttrName);
           var target = element.attr('target');
-          var isExternal = (['_blank', '_parent', '_self', '_top'].indexOf(target) > -1);          
-          
+          var isExternal = (['_blank', '_parent', '_self', '_top'].indexOf(target) > -1);
+
           if (href && $rootRouter.recognize(href) && !isExternal) {
             $rootRouter.navigateByUrl(href);
             event.preventDefault();
diff --git a/modules/angular1_router/test/integration/animation_spec.js b/modules/angular1_router/test/integration/animation_spec.js
index 7ab30b4c198b..bb11563041b5 100644
--- a/modules/angular1_router/test/integration/animation_spec.js
+++ b/modules/angular1_router/test/integration/animation_spec.js
@@ -1,3 +1,11 @@
+/**
+ * @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
+ */
+
 'use strict';
 
 describe('ngOutlet animations', function () {
diff --git a/modules/angular1_router/test/integration/lifecycle_hook_spec.js b/modules/angular1_router/test/integration/lifecycle_hook_spec.js
index 461103272f97..1d1c38a045fc 100644
--- a/modules/angular1_router/test/integration/lifecycle_hook_spec.js
+++ b/modules/angular1_router/test/integration/lifecycle_hook_spec.js
@@ -1,3 +1,11 @@
+/**
+ * @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
+ */
+
 'use strict';
 
 describe('Navigation lifecycle', function () {
diff --git a/modules/angular1_router/test/integration/navigation_spec.js b/modules/angular1_router/test/integration/navigation_spec.js
index ab4853f212c6..581cfca25b0e 100644
--- a/modules/angular1_router/test/integration/navigation_spec.js
+++ b/modules/angular1_router/test/integration/navigation_spec.js
@@ -1,3 +1,11 @@
+/**
+ * @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
+ */
+
 'use strict';
 
 describe('navigation', function () {
diff --git a/modules/angular1_router/test/integration/router_spec.js b/modules/angular1_router/test/integration/router_spec.js
index 37b4508a597a..350340cd76ce 100644
--- a/modules/angular1_router/test/integration/router_spec.js
+++ b/modules/angular1_router/test/integration/router_spec.js
@@ -1,3 +1,11 @@
+/**
+ * @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
+ */
+
 'use strict';
 
 describe('router', function () {
diff --git a/modules/angular1_router/test/integration/shim_spec.js b/modules/angular1_router/test/integration/shim_spec.js
index 31dec18b5cdf..b70041e1ac69 100644
--- a/modules/angular1_router/test/integration/shim_spec.js
+++ b/modules/angular1_router/test/integration/shim_spec.js
@@ -1,3 +1,11 @@
+/**
+ * @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
+ */
+
 'use strict';
 
 describe('ngRoute shim', function () {
diff --git a/modules/angular1_router/test/ng_link_spec.js b/modules/angular1_router/test/ng_link_spec.js
index 12ce06c92ea9..e55f88bb169a 100644
--- a/modules/angular1_router/test/ng_link_spec.js
+++ b/modules/angular1_router/test/ng_link_spec.js
@@ -1,3 +1,11 @@
+/**
+ * @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
+ */
+
 'use strict';
 
 describe('ngLink', function () {
diff --git a/modules/angular1_router/test/util.es5.js b/modules/angular1_router/test/util.es5.js
index 9b58fa6c6ca2..7ce89d8584a3 100644
--- a/modules/angular1_router/test/util.es5.js
+++ b/modules/angular1_router/test/util.es5.js
@@ -1,3 +1,11 @@
+/**
+ * @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
+ */
+
 /*
  * Helpers to keep tests DRY
  */
diff --git a/modules/playground/src/web_workers/images/b64.js b/modules/playground/src/web_workers/images/b64.js
index 46001d2f16c5..f850a56fe938 100644
--- a/modules/playground/src/web_workers/images/b64.js
+++ b/modules/playground/src/web_workers/images/b64.js
@@ -1,3 +1,4 @@
+// clang-format off
 var lookup = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
 
 ;(function (exports) {
diff --git a/modules/playground/src/web_workers/images/bitmap.js b/modules/playground/src/web_workers/images/bitmap.js
index 759f97957127..b4062f66da56 100644
--- a/modules/playground/src/web_workers/images/bitmap.js
+++ b/modules/playground/src/web_workers/images/bitmap.js
@@ -68,7 +68,7 @@ Bitmap.prototype.subsample =
   function gamma(v) { return sample(Math.pow(v, .45455)); }
 
   function row(pixel, width, y) {
-    var data = "\0";
+    var data = '\0';
     for (var x = 0; x < width; x++) {
       var r = pixel[x][y];
       data += String.fromCharCode(gamma(r[0]), gamma(r[1]), gamma(r[2]), sample(r[3]));
@@ -77,7 +77,7 @@ Bitmap.prototype.subsample =
   }
 
   function rows(pixel, width, height) {
-    var data = "";
+    var data = '';
     for (var y = 0; y < height; y++) data += row(pixel, width, y);
     return data;
   }
@@ -95,8 +95,8 @@ Bitmap.prototype.subsample =
 
   function deflate(data) {
     var len = data.length;
-    return "\170\1\1" + String.fromCharCode(len & 255, len >>> 8, ~len & 255, (~len >>> 8) & 255) +
-           data + hton(adler(data));
+    return '\170\1\1' + String.fromCharCode(len & 255, len >>> 8, ~len & 255, (~len >>> 8) & 255) +
+        data + hton(adler(data));
   }
 
   function crc32(data) {
@@ -110,18 +110,18 @@ Bitmap.prototype.subsample =
   function chunk(type, data) { return hton(data.length) + type + data + hton(crc32(type + data)); }
 
   function base64(data) {
-    enc = "";
+    enc = '';
     for (var i = 5, n = data.length * 8 + 5; i < n; i += 6)
-      enc += "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
+      enc += 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'
           [(data.charCodeAt(~~(i / 8) - 1) << 8 | data.charCodeAt(~~(i / 8))) >> 7 - i % 8 & 63];
-    for (; enc.length % 4; enc += "=")
+    for (; enc.length % 4; enc += '=')
       ;
     return enc;
   }
 
-  var png = "\211PNG\r\n\32\n" +
-            chunk("IHDR", hton(this.width) + hton(this.height) + "\10\6\0\0\0") +
-            chunk("IDAT", deflate(rows(this.pixel, this.width, this.height))) + chunk("IEND", "");
+  var png = '\211PNG\r\n\32\n' +
+      chunk('IHDR', hton(this.width) + hton(this.height) + '\10\6\0\0\0') +
+      chunk('IDAT', deflate(rows(this.pixel, this.width, this.height))) + chunk('IEND', '');
 
-  return "data:image/png;base64," + base64(png);
+  return 'data:image/png;base64,' + base64(png);
 }
diff --git a/modules/playground/src/web_workers/images/loader.js b/modules/playground/src/web_workers/images/loader.js
index 57d3e706b601..22706de6d986 100644
--- a/modules/playground/src/web_workers/images/loader.js
+++ b/modules/playground/src/web_workers/images/loader.js
@@ -1,9 +1,15 @@
-importScripts("../../../vendor/core.js",
-  "../../../vendor/zone.js",
-  "../../../vendor/long-stack-trace-zone.js",
-  "../../../vendor/system.src.js",
-  "../../../vendor/Reflect.js",
-  "b64.js");
+/**
+ * @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
+ */
+
+importScripts(
+    '../../../vendor/core.js', '../../../vendor/zone.js',
+    '../../../vendor/long-stack-trace-zone.js', '../../../vendor/system.src.js',
+    '../../../vendor/Reflect.js', 'b64.js');
 
 
 System.config({
@@ -19,21 +25,19 @@ System.config({
     '@angular/platform-webworker': {main: 'index.js', defaultExtension: 'js'},
     '@angular/platform-webworker-dynamic': {main: 'index.js', defaultExtension: 'js'},
     '@angular/router': {main: 'index.js', defaultExtension: 'js'},
-    'rxjs': {
-      defaultExtension: 'js'
-    }
+    'rxjs': {defaultExtension: 'js'},
   },
 
   defaultJSExtensions: true
 });
 
-System.import("playground/src/web_workers/images/background_index")
-  .then(
-    function(m) {
-      try {
-        m.main();
-      } catch (e) {
-        console.error(e);
-      }
-    },
-    function(error) { console.error("error loading background", error); });
+System.import('playground/src/web_workers/images/background_index')
+    .then(
+        function(m) {
+          try {
+            m.main();
+          } catch (e) {
+            console.error(e);
+          }
+        },
+        function(error) { console.error('error loading background', error); });
diff --git a/modules/playground/src/web_workers/input/loader.js b/modules/playground/src/web_workers/input/loader.js
index da3d48480f1d..e6768680b817 100644
--- a/modules/playground/src/web_workers/input/loader.js
+++ b/modules/playground/src/web_workers/input/loader.js
@@ -1,8 +1,15 @@
-importScripts("../../../vendor/core.js",
-  "../../../vendor/zone.js",
-  "../../../vendor/long-stack-trace-zone.js",
-  "../../../vendor/system.src.js",
-  "../../../vendor/Reflect.js");
+/**
+ * @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
+ */
+
+importScripts(
+    '../../../vendor/core.js', '../../../vendor/zone.js',
+    '../../../vendor/long-stack-trace-zone.js', '../../../vendor/system.src.js',
+    '../../../vendor/Reflect.js');
 
 
 System.config({
@@ -18,21 +25,19 @@ System.config({
     '@angular/platform-browser-dynamic': {main: 'index.js', defaultExtension: 'js'},
     '@angular/platform-webworker': {main: 'index.js', defaultExtension: 'js'},
     '@angular/platform-webworker-dynamic': {main: 'index.js', defaultExtension: 'js'},
-    'rxjs': {
-      defaultExtension: 'js'
-    }
+    'rxjs': {defaultExtension: 'js'},
   },
 
   defaultJSExtensions: true
 });
 
-System.import("playground/src/web_workers/input/background_index")
-  .then(
-    function(m) {
-      try {
-        m.main();
-      } catch (e) {
-        console.error(e);
-      }
-    },
-    function(error) { console.error("error loading background", error); });
+System.import('playground/src/web_workers/input/background_index')
+    .then(
+        function(m) {
+          try {
+            m.main();
+          } catch (e) {
+            console.error(e);
+          }
+        },
+        function(error) { console.error('error loading background', error); });
diff --git a/modules/playground/src/web_workers/kitchen_sink/loader.js b/modules/playground/src/web_workers/kitchen_sink/loader.js
index 8d6ab0ca0027..49afc84d6d0f 100644
--- a/modules/playground/src/web_workers/kitchen_sink/loader.js
+++ b/modules/playground/src/web_workers/kitchen_sink/loader.js
@@ -1,8 +1,15 @@
-importScripts("../../../vendor/core.js",
-  "../../../vendor/zone.js",
-  "../../../vendor/long-stack-trace-zone.js",
-  "../../../vendor/system.src.js",
-  "../../../vendor/Reflect.js");
+/**
+ * @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
+ */
+
+importScripts(
+    '../../../vendor/core.js', '../../../vendor/zone.js',
+    '../../../vendor/long-stack-trace-zone.js', '../../../vendor/system.src.js',
+    '../../../vendor/Reflect.js');
 
 
 System.config({
@@ -19,21 +26,19 @@ System.config({
     '@angular/platform-webworker': {main: 'index.js', defaultExtension: 'js'},
     '@angular/platform-webworker-dynamic': {main: 'index.js', defaultExtension: 'js'},
     '@angular/router': {main: 'index.js', defaultExtension: 'js'},
-    'rxjs': {
-      defaultExtension: 'js'
-    },
+    'rxjs': {defaultExtension: 'js'},
   },
 
   defaultJSExtensions: true
 });
 
-System.import("playground/src/web_workers/kitchen_sink/background_index")
-  .then(
-    function(m) {
-      try {
-        m.main();
-      } catch (e) {
-        console.error(e);
-      }
-    },
-    function(error) { console.error("error loading background", error); });
+System.import('playground/src/web_workers/kitchen_sink/background_index')
+    .then(
+        function(m) {
+          try {
+            m.main();
+          } catch (e) {
+            console.error(e);
+          }
+        },
+        function(error) { console.error('error loading background', error); });
diff --git a/modules/playground/src/web_workers/message_broker/loader.js b/modules/playground/src/web_workers/message_broker/loader.js
index b2bccbc7db31..d6e27f8cba2e 100644
--- a/modules/playground/src/web_workers/message_broker/loader.js
+++ b/modules/playground/src/web_workers/message_broker/loader.js
@@ -1,8 +1,15 @@
-importScripts("../../../vendor/core.js",
-  "../../../vendor/zone.js",
-  "../../../vendor/long-stack-trace-zone.js",
-  "../../../vendor/system.src.js",
-  "../../../vendor/Reflect.js");
+/**
+ * @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
+ */
+
+importScripts(
+    '../../../vendor/core.js', '../../../vendor/zone.js',
+    '../../../vendor/long-stack-trace-zone.js', '../../../vendor/system.src.js',
+    '../../../vendor/Reflect.js');
 
 
 System.config({
@@ -19,21 +26,19 @@ System.config({
     '@angular/router': {main: 'index.js', defaultExtension: 'js'},
     '@angular/platform-webworker': {main: 'index.js', defaultExtension: 'js'},
     '@angular/platform-webworker-dynamic': {main: 'index.js', defaultExtension: 'js'},
-    'rxjs': {
-      defaultExtension: 'js'
-    },
+    'rxjs': {defaultExtension: 'js'},
   },
 
   defaultJSExtensions: true
 });
 
-System.import("playground/src/web_workers/message_broker/background_index")
-  .then(
-    function(m) {
-      try {
-        m.main();
-      } catch (e) {
-        console.error(e);
-      }
-    },
-    function(error) { console.error("error loading background", error); });
+System.import('playground/src/web_workers/message_broker/background_index')
+    .then(
+        function(m) {
+          try {
+            m.main();
+          } catch (e) {
+            console.error(e);
+          }
+        },
+        function(error) { console.error('error loading background', error); });
diff --git a/modules/playground/src/web_workers/router/loader.js b/modules/playground/src/web_workers/router/loader.js
index 7f812c68e193..eaf32d6c571a 100644
--- a/modules/playground/src/web_workers/router/loader.js
+++ b/modules/playground/src/web_workers/router/loader.js
@@ -1,8 +1,15 @@
-importScripts("../../../vendor/core.js",
-  "../../../vendor/zone.js",
-  "../../../vendor/long-stack-trace-zone.js",
-  "../../../vendor/system.src.js",
-  "../../../vendor/Reflect.js");
+/**
+ * @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
+ */
+
+importScripts(
+    '../../../vendor/core.js', '../../../vendor/zone.js',
+    '../../../vendor/long-stack-trace-zone.js', '../../../vendor/system.src.js',
+    '../../../vendor/Reflect.js');
 
 
 System.config({
@@ -19,21 +26,19 @@ System.config({
     '@angular/platform-webworker': {main: 'index.js', defaultExtension: 'js'},
     '@angular/platform-webworker-dynamic': {main: 'index.js', defaultExtension: 'js'},
     '@angular/router': {main: 'index.js', defaultExtension: 'js'},
-    'rxjs': {
-      defaultExtension: 'js'
-    },
+    'rxjs': {defaultExtension: 'js'},
   },
 
   defaultJSExtensions: true
 });
 
-System.import("playground/src/web_workers/router/background_index")
-  .then(
-    function(m) {
-      try {
-        m.main();
-      } catch (e) {
-        console.error(e);
-      }
-    },
-    function(error) { console.error("error loading background", error); });
+System.import('playground/src/web_workers/router/background_index')
+    .then(
+        function(m) {
+          try {
+            m.main();
+          } catch (e) {
+            console.error(e);
+          }
+        },
+        function(error) { console.error('error loading background', error); });
diff --git a/modules/playground/src/web_workers/todo/loader.js b/modules/playground/src/web_workers/todo/loader.js
index b658b5f2af83..f6a091b54cbe 100644
--- a/modules/playground/src/web_workers/todo/loader.js
+++ b/modules/playground/src/web_workers/todo/loader.js
@@ -1,8 +1,15 @@
-importScripts("../../../vendor/core.js",
-  "../../../vendor/zone.js",
-  "../../../vendor/long-stack-trace-zone.js",
-  "../../../vendor/system.src.js",
-  "../../../vendor/Reflect.js");
+/**
+ * @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
+ */
+
+importScripts(
+    '../../../vendor/core.js', '../../../vendor/zone.js',
+    '../../../vendor/long-stack-trace-zone.js', '../../../vendor/system.src.js',
+    '../../../vendor/Reflect.js');
 
 
 System.config({
@@ -20,21 +27,19 @@ System.config({
     '@angular/platform-webworker': {main: 'index.js', defaultExtension: 'js'},
     '@angular/platform-webworker-dynamic': {main: 'index.js', defaultExtension: 'js'},
     '@angular/router': {main: 'index.js', defaultExtension: 'js'},
-    'rxjs': {
-      defaultExtension: 'js'
-    }
+    'rxjs': {defaultExtension: 'js'},
   },
 
   defaultJSExtensions: true
 });
 
-System.import("playground/src/web_workers/todo/background_index")
-  .then(
-    function(m) {
-      try {
-        m.main();
-      } catch (e) {
-        console.error(e);
-      }
-    },
-    function(error) { console.error("error loading background", error); });
+System.import('playground/src/web_workers/todo/background_index')
+    .then(
+        function(m) {
+          try {
+            m.main();
+          } catch (e) {
+            console.error(e);
+          }
+        },
+        function(error) { console.error('error loading background', error); });
diff --git a/modules/rollup-test/hello_world.js b/modules/rollup-test/hello_world.js
index dc7362e2bb76..a187d9e5c3d1 100644
--- a/modules/rollup-test/hello_world.js
+++ b/modules/rollup-test/hello_world.js
@@ -1,3 +1,11 @@
+/**
+ * @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
+ */
+
 var HelloWorldComponent = ng.core.Component({
   selector: 'hello-world',
   //template: 'hello world!!!'
diff --git a/modules/rollup-test/rollup.config.js b/modules/rollup-test/rollup.config.js
index a00d967cc464..074612554276 100644
--- a/modules/rollup-test/rollup.config.js
+++ b/modules/rollup-test/rollup.config.js
@@ -1,3 +1,11 @@
+/**
+ * @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 typescript from 'rollup-plugin-typescript';
 // import tsc from 'typescript'
 
diff --git a/protractor-e2e.conf.js b/protractor-e2e.conf.js
index 685fe883d93f..7afc6f56f2a8 100644
--- a/protractor-e2e.conf.js
+++ b/protractor-e2e.conf.js
@@ -1,45 +1,42 @@
+/**
+ * @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
+ */
+
 // Make sure that the command line is read as the first thing
 // as this could exit node if the help script should be printed.
 require('./dist/all/e2e_util/e2e_util').readCommandLine();
 
 var BROWSER_OPTIONS = {
   LocalChrome: {
-    'browserName': 'chrome'
+    'browserName': 'chrome',
   },
   ChromeOnTravis: {
     browserName: 'chrome',
     chromeOptions: {
       'args': ['--no-sandbox'],
-      'binary': process.env.CHROME_BIN
+      'binary': process.env.CHROME_BIN,
     }
   }
 };
 
 exports.config = {
-  onPrepare: function() {
-    beforeEach(function() {
-      browser.ignoreSynchronization = false;
-    });
-  },
+  onPrepare: function() { beforeEach(function() { browser.ignoreSynchronization = false; }); },
   allScriptsTimeout: 11000,
-  specs: [
-    'dist/all/**/e2e_test/**/*_spec.js'
-  ],
+  specs: ['dist/all/**/e2e_test/**/*_spec.js'],
   exclude: [
     'dist/all/@angular/examples/**',
     '**/key_events/**',  // can't tell why this is failing
-    '**/sourcemap/**'     // fails only on travis
+    '**/sourcemap/**'    // fails only on travis
   ],
   capabilities: process.env.TRAVIS ? BROWSER_OPTIONS.ChromeOnTravis : BROWSER_OPTIONS.LocalChrome,
   directConnect: true,
   baseUrl: 'http://localhost:8000/',
   framework: 'jasmine2',
-  jasmineNodeOpts: {
-    showColors: true,
-    defaultTimeoutInterval: 60000,
-    print: function(msg) { console.log(msg)}
-  },
-  useAllAngular2AppRoots: true
+  jasmineNodeOpts:
+      {showColors: true, defaultTimeoutInterval: 60000, print: function(msg) { console.log(msg) }},
+  useAllAngular2AppRoots: true,
 };
-
-
diff --git a/protractor-examples-e2e.conf.js b/protractor-examples-e2e.conf.js
index 69fb4243cc5f..8a08e3b2e036 100644
--- a/protractor-examples-e2e.conf.js
+++ b/protractor-examples-e2e.conf.js
@@ -1,30 +1,30 @@
+/**
+ * @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
+ */
+
 // Make sure that the command line is read as the first thing
 // as this could exit node if the help script should be printed.
 require('./dist/all/e2e_util/e2e_util').readCommandLine();
 
 var BROWSER_OPTIONS = {
-  LocalChrome: {
-    'browserName': 'chrome'
-  },
+  LocalChrome: {'browserName': 'chrome'},
   ChromeOnTravis: {
     browserName: 'chrome',
     chromeOptions: {
       'args': ['--no-sandbox'],
-      'binary': process.env.CHROME_BIN
+      'binary': process.env.CHROME_BIN,
     }
-  }
+  },
 };
 
 exports.config = {
-  onPrepare: function() {
-    beforeEach(function() {
-      browser.ignoreSynchronization = false;
-    });
-  },
+  onPrepare: function() { beforeEach(function() { browser.ignoreSynchronization = false; }); },
   allScriptsTimeout: 11000,
-  specs: [
-    'dist/examples/**/e2e_test/*_spec.js'
-  ],
+  specs: ['dist/examples/**/e2e_test/*_spec.js'],
   capabilities: process.env.TRAVIS ? BROWSER_OPTIONS.ChromeOnTravis : BROWSER_OPTIONS.LocalChrome,
   directConnect: true,
   baseUrl: 'http://localhost:8001/',
@@ -32,7 +32,7 @@ exports.config = {
   jasmineNodeOpts: {
     showColors: true,
     defaultTimeoutInterval: 60000,
-    print: function(msg) { console.log(msg)}
+    print: function(msg) { console.log(msg); },
   },
   useAllAngular2AppRoots: true
 };
diff --git a/protractor-perf.conf.js b/protractor-perf.conf.js
index 97b250225b60..a2a618be42de 100644
--- a/protractor-perf.conf.js
+++ b/protractor-perf.conf.js
@@ -1,3 +1,11 @@
+/**
+ * @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
+ */
+
 // Make sure that the command line is read as the first thing
 // as this could exit node if the help script should be printed.
 require('./dist/all/e2e_util/perf_util').readCommandLine();
@@ -15,32 +23,26 @@ var BROWSER_CAPS = {
     chromeOptions: CHROME_OPTIONS,
     loggingPrefs: {
       performance: 'ALL',
-      browser: 'ALL'
+      browser: 'ALL',
     }
   },
   ChromeOnTravis: {
     browserName: 'chrome',
     chromeOptions: mergeInto(CHROME_OPTIONS, {
-      'binary': process.env.CHROME_BIN
+      'binary': process.env.CHROME_BIN,
     }),
     loggingPrefs: {
       performance: 'ALL',
-      browser: 'ALL'
+      browser: 'ALL',
     }
   }
 };
 
 exports.config = {
-  onPrepare: function() {
-    beforeEach(function() {
-      browser.ignoreSynchronization = false;
-    });
-  },
+  onPrepare: function() { beforeEach(function() { browser.ignoreSynchronization = false; }); },
   restartBrowserBetweenTests: true,
   allScriptsTimeout: 11000,
-  specs: [
-    'dist/all/**/e2e_test/**/*_perf.js'
-  ],
+  specs: ['dist/all/**/e2e_test/**/*_perf.js'],
   capabilities: process.env.TRAVIS ? BROWSER_CAPS.ChromeOnTravis : BROWSER_CAPS.LocalChrome,
   directConnect: true,
   baseUrl: 'http://localhost:8000/',
@@ -48,14 +50,14 @@ exports.config = {
   jasmineNodeOpts: {
     showColors: true,
     defaultTimeoutInterval: 60000,
-    print: function(msg) { console.log(msg)}
+    print: function(msg) { console.log(msg); },
   },
   useAllAngular2AppRoots: true
 };
 
 function mergeInto(src, target) {
-for (var prop in src) {
-  target[prop] = src[prop];
-}
-return target;
+  for (var prop in src) {
+    target[prop] = src[prop];
+  }
+  return target;
 }
diff --git a/scripts/browserstack/start_tunnel.js b/scripts/browserstack/start_tunnel.js
index f4ebe0fa8fd4..c4bb6b95f79c 100644
--- a/scripts/browserstack/start_tunnel.js
+++ b/scripts/browserstack/start_tunnel.js
@@ -1,3 +1,11 @@
+/**
+ * @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
+ */
+
 'use strict';
 
 var fs = require('fs');
diff --git a/test-main.js b/test-main.js
index 11e11de04b1c..5507d941bddf 100644
--- a/test-main.js
+++ b/test-main.js
@@ -1,5 +1,13 @@
+/**
+ * @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
+ */
+
 // Tun on full stack traces in errors to help debugging
-Error.stackTraceLimit=Infinity;
+Error.stackTraceLimit = Infinity;
 
 jasmine.DEFAULT_TIMEOUT_INTERVAL = 100;
 
@@ -17,94 +25,32 @@ System.config({
     'parse5': 'dist/all/empty.js',
     '@angular/platform-server/src/parse5_adapter': 'dist/all/empty.js',
     'angular2/*': 'dist/all/angular2/*.js',
-    'angular2/src/alt_router/router_testing_providers': 'dist/all/angular2/src/alt_router/router_testing_providers.js'
+    'angular2/src/alt_router/router_testing_providers':
+        'dist/all/angular2/src/alt_router/router_testing_providers.js'
   },
   packages: {
-    '@angular/core/testing': {
-      main: 'index.js',
-      defaultExtension: 'js'
-    },
-    '@angular/core': {
-      main: 'index.js',
-      defaultExtension: 'js'
-    },
-    '@angular/compiler/testing': {
-      main: 'index.js',
-      defaultExtension: 'js'
-    },
-    '@angular/compiler': {
-      main: 'index.js',
-      defaultExtension: 'js'
-    },
-    '@angular/common/testing': {
-      main: 'index.js',
-      defaultExtension: 'js'
-    },
-    '@angular/common': {
-      main: 'index.js',
-      defaultExtension: 'js'
-    },
-    '@angular/forms': {
-      main: 'index.js',
-      defaultExtension: 'js'
-    },
+    '@angular/core/testing': {main: 'index.js', defaultExtension: 'js'},
+    '@angular/core': {main: 'index.js', defaultExtension: 'js'},
+    '@angular/compiler/testing': {main: 'index.js', defaultExtension: 'js'},
+    '@angular/compiler': {main: 'index.js', defaultExtension: 'js'},
+    '@angular/common/testing': {main: 'index.js', defaultExtension: 'js'},
+    '@angular/common': {main: 'index.js', defaultExtension: 'js'},
+    '@angular/forms': {main: 'index.js', defaultExtension: 'js'},
     // remove after all tests imports are fixed
-    '@angular/facade': {
-      main: 'index.js',
-      defaultExtension: 'js'
-    },
-    '@angular/router/testing': {
-      main: 'index.js',
-      defaultExtension: 'js'
-    },
-    '@angular/router': {
-      main: 'index.js',
-      defaultExtension: 'js'
-    },
-    '@angular/http/testing': {
-      main: 'index.js',
-      defaultExtension: 'js'
-    },
-    '@angular/http': {
-      main: 'index.js',
-      defaultExtension: 'js'
-    },
-    '@angular/upgrade': {
-      main: 'index.js',
-      defaultExtension: 'js'
-    },
-    '@angular/platform-browser/testing': {
-      main: 'index.js',
-      defaultExtension: 'js'
-    },
-    '@angular/platform-browser': {
-      main: 'index.js',
-      defaultExtension: 'js'
-    },
-    '@angular/platform-browser-dynamic/testing': {
-      main: 'index.js',
-      defaultExtension: 'js'
-    },
-    '@angular/platform-browser-dynamic': {
-      main: 'index.js',
-      defaultExtension: 'js'
-    },
-    '@angular/platform-server/testing': {
-      main: 'index.js',
-      defaultExtension: 'js'
-    },
-    '@angular/platform-server': {
-      main: 'index.js',
-      defaultExtension: 'js'
-    },
-    '@angular/platform-webworker': {
-      main: 'index.js',
-      defaultExtension: 'js'
-    },
-    '@angular/platform-webworker-dynamic': {
-      main: 'index.js',
-      defaultExtension: 'js'
-    }
+    '@angular/facade': {main: 'index.js', defaultExtension: 'js'},
+    '@angular/router/testing': {main: 'index.js', defaultExtension: 'js'},
+    '@angular/router': {main: 'index.js', defaultExtension: 'js'},
+    '@angular/http/testing': {main: 'index.js', defaultExtension: 'js'},
+    '@angular/http': {main: 'index.js', defaultExtension: 'js'},
+    '@angular/upgrade': {main: 'index.js', defaultExtension: 'js'},
+    '@angular/platform-browser/testing': {main: 'index.js', defaultExtension: 'js'},
+    '@angular/platform-browser': {main: 'index.js', defaultExtension: 'js'},
+    '@angular/platform-browser-dynamic/testing': {main: 'index.js', defaultExtension: 'js'},
+    '@angular/platform-browser-dynamic': {main: 'index.js', defaultExtension: 'js'},
+    '@angular/platform-server/testing': {main: 'index.js', defaultExtension: 'js'},
+    '@angular/platform-server': {main: 'index.js', defaultExtension: 'js'},
+    '@angular/platform-webworker': {main: 'index.js', defaultExtension: 'js'},
+    '@angular/platform-webworker-dynamic': {main: 'index.js', defaultExtension: 'js'},
   }
 });
 
@@ -112,34 +58,33 @@ System.config({
 // Set up the test injector, then import all the specs, execute their `main()`
 // method and kick off Karma (Jasmine).
 System.import('@angular/core/testing')
-  .then(function(coreTesting){
-    return System.import('@angular/platform-browser-dynamic/testing')
-      .then(function(browserTesting) {
-         coreTesting.TestBed.initTestEnvironment(
-           browserTesting.BrowserDynamicTestingModule,
-           browserTesting.platformBrowserDynamicTesting());
-      });
-  })
-.then(function() {
-  return Promise.all(
-    Object.keys(window.__karma__.files) // All files served by Karma.
-    .filter(onlySpecFiles)
-    .map(window.file2moduleName)        // Normalize paths to module names.
-    .map(function(path) {
-      return System.import(path).then(function(module) {
-        if (module.hasOwnProperty('main')) {
-          module.main();
-        } else {
-          throw new Error('Module ' + path + ' does not implement main() method.');
-        }
-      });
-    }));
-})
-.then(function() {
-  __karma__.start();
-}, function(error) {
-  __karma__.error(error.stack || error);
-});
+    .then(function(coreTesting) {
+      return System.import('@angular/platform-browser-dynamic/testing')
+          .then(function(browserTesting) {
+            coreTesting.TestBed.initTestEnvironment(
+                browserTesting.BrowserDynamicTestingModule,
+                browserTesting.platformBrowserDynamicTesting());
+          });
+    })
+    .then(function() {
+      return Promise.all(Object
+                             .keys(window.__karma__.files)  // All files served by Karma.
+                             .filter(onlySpecFiles)
+                             .map(window.file2moduleName)  // Normalize paths to module names.
+                             .map(function(path) {
+                               return System.import(path).then(function(module) {
+                                 if (module.hasOwnProperty('main')) {
+                                   module.main();
+                                 } else {
+                                   throw new Error(
+                                       'Module ' + path + ' does not implement main() method.');
+                                 }
+                               });
+                             }));
+    })
+    .then(
+        function() { __karma__.start(); },
+        function(error) { __karma__.error(error.stack || error); });
 
 
 function onlySpecFiles(path) {
diff --git a/tools/build/benchpress.js b/tools/build/benchpress.js
index 7ccbbc923ee7..a4de6a40c577 100644
--- a/tools/build/benchpress.js
+++ b/tools/build/benchpress.js
@@ -1,6 +1,11 @@
+/**
+ * @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
+ */
+
 module.exports = function(gulp, plugins, config) {
-  return function(done) {
-    del(config.path, done);
-  };
+  return function(done) { del(config.path, done); };
 };
-
diff --git a/tools/build/file2modulename.js b/tools/build/file2modulename.js
index 2906ade4f6b3..5cd7810e213b 100644
--- a/tools/build/file2modulename.js
+++ b/tools/build/file2modulename.js
@@ -1,15 +1,24 @@
+/**
+ * @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
+ */
+
 function file2moduleName(filePath) {
-  return filePath.replace(/\\/g, '/')
-    // module name should be relative to `modules` and `tools` folder
-    .replace(/.*\/modules\//, '')
-    //  and 'dist' folder
-    .replace(/.*\/dist\/js\/dev\/es5\//, '')
-    // module name should not include `lib`, `web` folders
-    // as they are wrapper packages for dart
-    .replace(/\/web\//, '/')
-    .replace(/\/lib\//, '/')
-    // module name should not have a suffix
-    .replace(/\.\w*$/, '');
+  return filePath
+      .replace(/\\/g, '/')
+      // module name should be relative to `modules` and `tools` folder
+      .replace(/.*\/modules\//, '')
+      //  and 'dist' folder
+      .replace(/.*\/dist\/js\/dev\/es5\//, '')
+      // module name should not include `lib`, `web` folders
+      // as they are wrapper packages for dart
+      .replace(/\/web\//, '/')
+      .replace(/\/lib\//, '/')
+      // module name should not have a suffix
+      .replace(/\.\w*$/, '');
 }
 if (typeof module !== 'undefined') {
   module.exports = file2moduleName;
diff --git a/tools/build/licensewrap.js b/tools/build/licensewrap.js
index 3d8783007064..694635cbf2a9 100644
--- a/tools/build/licensewrap.js
+++ b/tools/build/licensewrap.js
@@ -1,7 +1,15 @@
+/**
+ * @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
+ */
+
 var fs = require('fs');
 module.exports = function(licenseFile, outputFile) {
   var licenseText = fs.readFileSync(licenseFile);
-  var license = "/**\n @license\n" + licenseText + "\n */\n";
+  var license = '/**\n @license\n' + licenseText + '\n */\n';
   if (outputFile) {
     outputFile = licenseFile + '.wrapped';
     fs.writeFileSync(outputFile, license, 'utf8');
diff --git a/tools/build/linknodemodules.js b/tools/build/linknodemodules.js
index 9c4f9eaf94fe..14a49c79489f 100644
--- a/tools/build/linknodemodules.js
+++ b/tools/build/linknodemodules.js
@@ -1,3 +1,11 @@
+/**
+ * @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
+ */
+
 var fs = require('fs');
 var path = require('path');
 
@@ -8,8 +16,7 @@ module.exports = function(gulp, plugins, config) {
       console.log('creating link', linkDir, sourceDir);
       try {
         fs.symlinkSync(sourceDir, linkDir, 'dir');
-      }
-      catch(e) {
+      } catch (e) {
         var sourceDir = path.join(config.dir, relativeFolder);
         console.log('linking failed: trying to hard copy', linkDir, sourceDir);
         copyRecursiveSync(sourceDir, linkDir);
@@ -35,14 +42,13 @@ module.exports = function(gulp, plugins, config) {
   };
 };
 
-function copyRecursiveSync (src, dest) {
+function copyRecursiveSync(src, dest) {
   if (fs.existsSync(src)) {
     var stats = fs.statSync(src);
     if (stats.isDirectory()) {
       fs.mkdirSync(dest);
       fs.readdirSync(src).forEach(function(childItemName) {
-        copyRecursiveSync(path.join(src, childItemName),
-                          path.join(dest, childItemName));
+        copyRecursiveSync(path.join(src, childItemName), path.join(dest, childItemName));
       });
     } else {
       fs.writeFileSync(dest, fs.readFileSync(src));
diff --git a/tools/build/logging.js b/tools/build/logging.js
index f7e3d2313e5d..fb6e8f2f5cdb 100644
--- a/tools/build/logging.js
+++ b/tools/build/logging.js
@@ -1,3 +1,11 @@
+/**
+ * @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
+ */
+
 var kLogsArgument = /^--logs\s*=\s*(.+?)$/;
 var kTrimLeft = /^\s+/;
 var kTrimRight = /\s+$/;
@@ -15,23 +23,18 @@ function findArgvLogs() {
 }
 
 function logsToObject(logstr) {
-  return logstr.
-    split(',').
-    reduce(function(obj, key) {
-      key = camelize(key);
-      if (key.length > 0) obj[key] = true;
-      return obj;
-    }, Object.create(null));
+  return logstr.split(',').reduce(function(obj, key) {
+    key = camelize(key);
+    if (key.length > 0) obj[key] = true;
+    return obj;
+  }, Object.create(null));
   return logs;
 }
 
 function camelize(str) {
-  return str.
-    replace(kTrimLeft, '').
-    replace(kTrimRight, '').
-    replace(kCamelCase, function(match, c) {
-      return c ? c.toUpperCase() : "";
-    });
+  return str.replace(kTrimLeft, '').replace(kTrimRight, '').replace(kCamelCase, function(match, c) {
+    return c ? c.toUpperCase() : '';
+  });
 }
 
 function shouldLog(str) {
diff --git a/tools/build/snippets/url_params_to_form.js b/tools/build/snippets/url_params_to_form.js
index 60adbd3ff8a6..a9dd0c29acb8 100644
--- a/tools/build/snippets/url_params_to_form.js
+++ b/tools/build/snippets/url_params_to_form.js
@@ -1,3 +1,11 @@
+/**
+ * @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
+ */
+
 // helper script that will read out the url parameters
 // and store them in appropriate form fields on the page
 (function() {
@@ -6,9 +14,9 @@
   while (match = regex.exec(search)) {
     var name = match[1];
     var value = match[2];
-    var els = document.querySelectorAll('input[name="'+name+'"]');
+    var els = document.querySelectorAll('input[name="' + name + '"]');
     var el;
-    for (var i=0; i<els.length; i++) {
+    for (var i = 0; i < els.length; i++) {
       el = els[i];
       if (el.type === 'radio' || el.type === 'checkbox') {
         el.checked = el.value === value;
diff --git a/tools/build/util.js b/tools/build/util.js
index 75f8f8979ec6..70cf48320f82 100644
--- a/tools/build/util.js
+++ b/tools/build/util.js
@@ -1,5 +1,12 @@
+/**
+ * @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
+ */
+
 var fs = require('fs');
-var path = require('path');
 var minimatch = require('minimatch');
 var path = require('path');
 var Q = require('q');
@@ -21,10 +28,8 @@ function subDirs(dir) {
 
 function forEachSubDir(dir, callback) {
   var dirs = subDirs(dir);
-  return Q.all(dirs.map(function(subdir) {
-    return callback(path.join(dir, subdir));
-  }));
-};
+  return Q.all(dirs.map(function(subdir) { return callback(path.join(dir, subdir)); }));
+}
 
 function forEachSubDirSequential(dir, callback) {
   var dirs = subDirs(dir);
@@ -32,9 +37,7 @@ function forEachSubDirSequential(dir, callback) {
 
   function next(index) {
     if (index < dirs.length) {
-      return callback(path.join(dir, dirs[index])).then(function() {
-        return next(index+1);
-      });
+      return callback(path.join(dir, dirs[index])).then(function() { return next(index + 1); });
     } else {
       return true;
     }
@@ -75,6 +78,6 @@ function filterByFile(pathMapping, folder) {
   if (match !== undefined) {
     return match;
   } else {
-    throw new Error('No entry for folder '+folder+' found in '+JSON.stringify(pathMapping));
+    throw new Error('No entry for folder ' + folder + ' found in ' + JSON.stringify(pathMapping));
   }
 }
diff --git a/tools/build/watch.js b/tools/build/watch.js
index cf544f127a58..7f623a5afc61 100644
--- a/tools/build/watch.js
+++ b/tools/build/watch.js
@@ -1,3 +1,11 @@
+/**
+ * @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
+ */
+
 var chokidar = require('chokidar');
 var runSequence = require('run-sequence');
 var path = require('path');
@@ -16,9 +24,7 @@ function watch(globs, opts, tasks) {
     if (!Array.isArray(tasks)) tasks = [tasks];
     tasks = tasks.slice();
     tasks.push(tasksDone);
-    runTasks = function runTaskSequence() {
-      runSequence.apply(null, tasks);
-    }
+    runTasks = function runTaskSequence() { runSequence.apply(null, tasks); };
   } else {
     var sync = tasks.length === 0;
     runTasks = function runCallback() {
@@ -42,13 +48,11 @@ function watch(globs, opts, tasks) {
   var delay = opts.delay;
   if (delay === undefined) delay = 100;
 
-  var watcher = chokidar.watch(globs, opts).
-      on('all', handleEvent).
-      on('error', function(err) {
-        throw err;
-      });
+  var watcher =
+      chokidar.watch(globs, opts).on('all', handleEvent).on('error', function(err) { throw err; });
 
-  var log = function watchLogger(triggerCount) {
+  var log =
+      function watchLogger(triggerCount) {
     // Don't report change for initial event
     if (!ignoreInitial && !--triggerCount) return;
 
@@ -62,7 +66,7 @@ function watch(globs, opts, tasks) {
 
     function prettyTime() {
       var now = new Date();
-      return now.toLocaleDateString() + " at " + now.toLocaleTimeString();
+      return now.toLocaleDateString() + ' at ' + now.toLocaleTimeString();
     }
   }
 
@@ -76,8 +80,8 @@ function watch(globs, opts, tasks) {
     close();
   };
 
-  var eventsRecorded = 0; // Number of events recorded
-  var timeoutId = null; // If non-null, event capture window is open
+  var eventsRecorded = 0;  // Number of events recorded
+  var timeoutId = null;    // If non-null, event capture window is open
 
   if (!ignoreInitial) {
     // synthetic event to kick off the first task run
diff --git a/tools/build/watch.spec.js b/tools/build/watch.spec.js
index 20a2ddd802ab..c64ea80091be 100644
--- a/tools/build/watch.spec.js
+++ b/tools/build/watch.spec.js
@@ -1,3 +1,11 @@
+/**
+ * @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
+ */
+
 var rewire = require('rewire');
 
 describe('watch()', function() {
@@ -27,7 +35,7 @@ describe('watch()', function() {
 
   it('should fire callback once for events which occur within `delay` window', function() {
     var cb = jasmine.createSpy('callback');
-    watcher = watch('./$$fake_path/**/*', { delay: 10, log: false }, cb);
+    watcher = watch('./$$fake_path/**/*', {delay: 10, log: false}, cb);
 
     watcher._emit('add', './$$fake_path/test.txt');
     timeout.flush(9);
@@ -61,7 +69,7 @@ describe('watch()', function() {
       expect(timeout.pending).toBe(1);
     }
 
-    var watcher = watch('./$$fake_path/**/*', { delay: 10, log: false }, cb);
+    var watcher = watch('./$$fake_path/**/*', {delay: 10, log: false}, cb);
 
     watcher._emit('change', './$$fake_path/test1.txt');
     expect(timeout.pending).toBe(1);
@@ -81,7 +89,7 @@ describe('watch()', function() {
       done();
     }
 
-    var watcher = watch('./$$fake_path/**/*', { delay: 10, log: false }, cb);
+    var watcher = watch('./$$fake_path/**/*', {delay: 10, log: false}, cb);
 
     watcher._emit('change', './$$fake_path/test1.txt');
     timeout.flush();
@@ -96,7 +104,7 @@ describe('watch()', function() {
 
   it('should cancel pending callback if FSWatcher is closed', function() {
     var cb = jasmine.createSpy('callback');
-    var watcher = watch('./$$fake_path/**/*', { delay: 10, log: false }, cb);
+    var watcher = watch('./$$fake_path/**/*', {delay: 10, log: false}, cb);
 
     watcher._emit('change', './$$fake_path/test1.txt');
     expect(timeout.pending).toBe(1);
@@ -119,7 +127,7 @@ describe('watch()', function() {
       expect(timeout.pending).toBe(0);
     }
 
-    var watcher = watch('./$$fake_path/**/*', { delay: 10, log: false }, cb);
+    var watcher = watch('./$$fake_path/**/*', {delay: 10, log: false}, cb);
     watcher._emit('change', './$$fake_path/test1.txt');
 
     timeout.flush(10);
@@ -136,21 +144,13 @@ function mockTimeout() {
   var now = 0;
 
   return {
-    mocks: {
-      setTimeout: mockSetTimeout,
-      clearTimeout: mockClearTimeout
-    },
-    flush: flush,
-    get pending() { return events.length; }
+    mocks: {setTimeout: mockSetTimeout, clearTimeout: mockClearTimeout},
+    flush: flush, get pending() { return events.length; }
   };
 
   function mockSetTimeout(fn, delay) {
     delay = delay || 0;
-    events.push({
-      time: now + delay,
-      fn: fn,
-      id: id
-    });
+    events.push({time: now + delay, fn: fn, id: id});
     events.sort(function(a, b) { return a.time - b.time; });
     return id++;
   }
@@ -165,9 +165,12 @@ function mockTimeout() {
   }
 
   function flush(delay) {
-    if (delay !== undefined) now += delay;
-    else if (events.length) now = events[events.length - 1].time;
-    else throw new Error('No timer events registered');
+    if (delay !== undefined)
+      now += delay;
+    else if (events.length)
+      now = events[events.length - 1].time;
+    else
+      throw new Error('No timer events registered');
 
     while (events.length && events[0].time <= now) {
       events.shift().fn();
diff --git a/tools/build/webpack/angular2-all-testing.umd.js b/tools/build/webpack/angular2-all-testing.umd.js
index 05268551fe25..e070f9e38a78 100644
--- a/tools/build/webpack/angular2-all-testing.umd.js
+++ b/tools/build/webpack/angular2-all-testing.umd.js
@@ -1,3 +1,11 @@
+/**
+ * @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
+ */
+
 // this bundle is almost identical to the angular2.umd.js
 // the only difference being "testing" exports
 exports.core = require('angular2/core');
@@ -8,9 +16,7 @@ exports.platform = {
   common_dom: require('angular2/platform/common_dom'),
 
   // this is included as compared to the angular2-all.umd.js bundle
-  testing: {
-    browser: require('angular2/platform/testing/browser')
-  }
+  testing: {browser: require('angular2/platform/testing/browser')}
 };
 exports.http = require('angular2/http');
 exports.router = require('angular2/router');
diff --git a/tools/build/webpack/angular2-all.umd.js b/tools/build/webpack/angular2-all.umd.js
index 64bba9d5dc53..ffc20f4eb038 100644
--- a/tools/build/webpack/angular2-all.umd.js
+++ b/tools/build/webpack/angular2-all.umd.js
@@ -1,3 +1,11 @@
+/**
+ * @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
+ */
+
 exports.core = require('angular2/core');
 exports.common = require('angular2/common');
 exports.compiler = require('angular2/compiler');
diff --git a/tools/build/webpack/promiseify.js b/tools/build/webpack/promiseify.js
index a4a8612a5b5c..9cf8c2cdcf6a 100644
--- a/tools/build/webpack/promiseify.js
+++ b/tools/build/webpack/promiseify.js
@@ -1,3 +1,11 @@
+/**
+ * @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
+ */
+
 var webpack = require('webpack');
 
 /**
@@ -8,8 +16,7 @@ var webpack = require('webpack');
  * @returns {Function}
  */
 function webPackPromiseify(options) {
-
-  return new Promise(function (resolve, reject) {
+  return new Promise(function(resolve, reject) {
 
     webpack(options, function(err, stats) {
       var jsonStats = stats.toJson() || {};
@@ -29,4 +36,4 @@ function webPackPromiseify(options) {
   });
 }
 
-module.exports  = webPackPromiseify;
+module.exports = webPackPromiseify;
diff --git a/tools/check-environment.js b/tools/check-environment.js
index 9ad9cf00ceb0..04b1a94ae66c 100644
--- a/tools/check-environment.js
+++ b/tools/check-environment.js
@@ -1,3 +1,11 @@
+/**
+ * @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
+ */
+
 /* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    !!!                                                                                   !!!
    !!!  This file is special in that it must be able to execute with wrong Node version  !!!
@@ -16,28 +24,29 @@ var issues = [];
 
 // coarse Node version check
 if (+process.version[1] < 5) {
-  issues.push("Angular 2 build currently requires Node 5+. Use nvm to update your node version.");
+  issues.push('Angular 2 build currently requires Node 5+. Use nvm to update your node version.');
 }
 
 try {
   semver = require('semver');
-} catch(e) {
-  issues.push("Looks like you are missing some npm dependencies. Run: npm install");
+} catch (e) {
+  issues.push('Looks like you are missing some npm dependencies. Run: npm install');
 }
 
 if (issues.length) {
   printWarning(issues);
-  console.error("Your environment doesn't provide the prerequisite dependencies.\n" +
-                "Please fix the issues listed above and then rerun the gulp command.\n" +
-                "Check out https://github.com/angular/angular/blob/master/DEVELOPER.md for more info.");
+  console.error(
+      'Your environment doesn\'t provide the prerequisite dependencies.\n' +
+      'Please fix the issues listed above and then rerun the gulp command.\n' +
+      'Check out https://github.com/angular/angular/blob/master/DEVELOPER.md for more info.');
   process.exit(1);
 }
 
 // wrap in try/catch in case someone requires from within that file
 try {
   checkNodeModules = require('./npm/check-node-modules.js');
-} catch(e) {
-  issues.push("Looks like you are missing some npm dependencies. Run: npm install");
+} catch (e) {
+  issues.push('Looks like you are missing some npm dependencies. Run: npm install');
   throw e;
 } finally {
   // print warnings and move on, the next steps will likely fail, but hey, we warned them.
@@ -45,7 +54,6 @@ try {
 }
 
 function checkEnvironment(reqs) {
-
   exec('npm --version', function(e, stdout) {
     var foundNpmVersion = semver.clean(stdout);
     var foundNodeVersion = process.version;
@@ -53,17 +61,20 @@ function checkEnvironment(reqs) {
 
 
     if (!semver.satisfies(foundNodeVersion, reqs.requiredNodeVersion)) {
-      issues.push('You are running unsupported node version. Found: ' + foundNodeVersion +
-        ' Expected: ' + reqs.requiredNodeVersion + '. Use nvm to update your node version.');
+      issues.push(
+          'You are running unsupported node version. Found: ' + foundNodeVersion + ' Expected: ' +
+          reqs.requiredNodeVersion + '. Use nvm to update your node version.');
     }
 
     if (!semver.satisfies(foundNpmVersion, reqs.requiredNpmVersion)) {
-      issues.push('You are running unsupported npm version. Found: ' + foundNpmVersion +
-        ' Expected: ' + reqs.requiredNpmVersion + '. Run: npm update -g npm');
+      issues.push(
+          'You are running unsupported npm version. Found: ' + foundNpmVersion + ' Expected: ' +
+          reqs.requiredNpmVersion + '. Run: npm update -g npm');
     }
 
     if (!checkNodeModules()) {
-      issues.push('Your node_modules directory is stale or out of sync with npm-shrinkwrap.json. Run: npm install');
+      issues.push(
+          'Your node_modules directory is stale or out of sync with npm-shrinkwrap.json. Run: npm install');
     }
 
     printWarning(issues);
@@ -76,7 +87,7 @@ function printWarning(issues) {
   console.warn('');
   console.warn('!'.repeat(110));
   console.warn('!!!  Your environment is not in a good shape. Following issues were found:');
-  issues.forEach(function(issue) {console.warn('!!!   - ' + issue);});
+  issues.forEach(function(issue) { console.warn('!!!   - ' + issue); });
   console.warn('!'.repeat(110));
   console.warn('');
 
diff --git a/tools/chromedriverpatch.js b/tools/chromedriverpatch.js
index 4f07122cbaf3..0a574697c079 100644
--- a/tools/chromedriverpatch.js
+++ b/tools/chromedriverpatch.js
@@ -1,3 +1,11 @@
+/**
+ * @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
+ */
+
 /**
  * Patch Protractor so that it uses ChromeDriver 2.14 instead of 2.15.
  *
@@ -13,11 +21,11 @@ var path = require('path');
 var protractorConfigFile = path.resolve(require.resolve('protractor'), '../../config.json');
 
 var newConfig = {
-  "webdriverVersions": {
-    "selenium": "2.45.0",
-    "chromedriver": "2.14",
-    "iedriver": "2.45.0"
+  'webdriverVersions': {
+    'selenium': '2.45.0',
+    'chromedriver': '2.14',
+    'iedriver': '2.45.0',
   }
-}
+};
 
-fs.writeFile(protractorConfigFile,  JSON.stringify(newConfig));
+fs.writeFile(protractorConfigFile, JSON.stringify(newConfig));
diff --git a/tools/code.angularjs.org/add-license-to-rx.js b/tools/code.angularjs.org/add-license-to-rx.js
index 559671385d81..9a8c146060cf 100644
--- a/tools/code.angularjs.org/add-license-to-rx.js
+++ b/tools/code.angularjs.org/add-license-to-rx.js
@@ -1,4 +1,11 @@
 #! /usr/bin/env node
+/**
+ * @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
+ */
 
 /**
  * TODO: remove this file when license is included in RxJS bundles.
@@ -17,22 +24,19 @@ ${license}
 **/
 `;
 
-var bundles = fs.readdirSync(args['build-path'])
-  // Match files that begin with Rx and end with js
-  .filter(bundle => /^Rx\.?.*\.js$/.test(bundle))
-  // Load file contents
-  .map(bundle => {
-    return {
-      path: bundle,
-      contents: fs.readFileSync(`${args['build-path']}/${bundle}`).toString()
-    };
-  })
-  // Concatenate license to bundle
-  .map(bundle => {
-    return {
-      path: bundle.path,
-      contents: `${license}${bundle.contents}`
-    };
-  })
-  // Write file to disk
-  .forEach(bundle => fs.writeFileSync(`${args['build-path']}/${bundle.path}`, bundle.contents));
+var bundles =
+    fs.readdirSync(args['build-path'])
+        // Match files that begin with Rx and end with js
+        .filter(bundle => /^Rx\.?.*\.js$/.test(bundle))
+        // Load file contents
+        .map(bundle => {
+          return {
+            path: bundle,
+            contents: fs.readFileSync(`${args['build-path']}/${bundle}`).toString()
+          };
+        })
+        // Concatenate license to bundle
+        .map(bundle => { return {path: bundle.path, contents: `${license}${bundle.contents}`}; })
+        // Write file to disk
+        .forEach(
+            bundle => fs.writeFileSync(`${args['build-path']}/${bundle.path}`, bundle.contents));
diff --git a/tools/karma/reporter.js b/tools/karma/reporter.js
index ecc0b85eb2f3..9c518d89ad4c 100644
--- a/tools/karma/reporter.js
+++ b/tools/karma/reporter.js
@@ -1,39 +1,44 @@
+/**
+ * @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
+ */
+
 var SourceMapConsumer = require('source-map').SourceMapConsumer;
 var DotsReporter = require('karma/lib/reporters/dots_color');
 
-var createErrorFormatter = function (basePath, emitter, SourceMapConsumer) {
+var createErrorFormatter = function(basePath, emitter, SourceMapConsumer) {
   var lastServedFiles = [];
-  emitter.on('file_list_modified', function (files) {
-    lastServedFiles = files.served
-  });
-  function findFile(path) {
-    return lastServedFiles.filter(_ => _.path === path)[0];
-  }
+  emitter.on('file_list_modified', function(files) { lastServedFiles = files.served });
+  function findFile(path) { return lastServedFiles.filter(_ => _.path === path)[0]; }
 
-  var URL_REGEXP = new RegExp('(?:https?:\\/\\/[^\\/]*)?\\/?' +
-    '(base|absolute)' + // prefix
-    '((?:[A-z]\\:)?[^\\?\\s\\:]*)' + // path
-    '(\\?\\w*)?' + // sha
-    '(\\:(\\d+))?' + // line
-    '(\\:(\\d+))?' + // column
-    '', 'g')
+  var URL_REGEXP = new RegExp(
+      '(?:https?:\\/\\/[^\\/]*)?\\/?' +
+          '(base|absolute)' +               // prefix
+          '((?:[A-z]\\:)?[^\\?\\s\\:]*)' +  // path
+          '(\\?\\w*)?' +                    // sha
+          '(\\:(\\d+))?' +                  // line
+          '(\\:(\\d+))?' +                  // column
+          '',
+      'g');
 
-  return function (msg, indentation) {
-    msg = (msg || '').replace(URL_REGEXP, function (_, prefix, path, __, ___, line, ____, column) {
+  return function(msg, indentation) {
+    msg = (msg || '').replace(URL_REGEXP, function(_, prefix, path, __, ___, line, ____, column) {
       if (prefix === 'base') {
         path = basePath + path;
       }
       line = parseInt(line || '0', 10);
       column = parseInt(column || '0', 10);
 
-      var file = findFile(path)
+      var file = findFile(path);
       if (file && file.sourceMap) {
         try {
-          var original = new SourceMapConsumer(file.sourceMap).originalPositionFor({
-            line: line,
-            column: column
-          });
-          return process.cwd() + "/modules/" + original.source + ":" + original.line + ":" + original.column;
+          var original = new SourceMapConsumer(file.sourceMap)
+                             .originalPositionFor({line: line, column: column});
+          return process.cwd() + '/modules/' + original.source + ':' + original.line + ':' +
+              original.column;
         } catch (e) {
           console.warn('SourceMap position not found for trace: %s', msg);
         }
@@ -47,13 +52,16 @@ var createErrorFormatter = function (basePath, emitter, SourceMapConsumer) {
     }
     return msg + '\n';
   }
-}
+};
 
 
-var InternalAngularReporter = function (config, emitter) {
+var InternalAngularReporter = function(config, emitter) {
   var formatter = createErrorFormatter(config.basePath, emitter, SourceMapConsumer);
   DotsReporter.call(this, formatter, false, config.colors)
-}
-InternalAngularReporter.$inject = ['config', 'emitter']
+};
+
+InternalAngularReporter.$inject = ['config', 'emitter'];
 
-module.exports = {'reporter:internal-angular': ['type', InternalAngularReporter]};
+module.exports = {
+  'reporter:internal-angular': ['type', InternalAngularReporter]
+};
diff --git a/tools/npm/check-node-modules.js b/tools/npm/check-node-modules.js
index 64215c04c211..68747d379a2a 100755
--- a/tools/npm/check-node-modules.js
+++ b/tools/npm/check-node-modules.js
@@ -1,4 +1,12 @@
-"use strict";
+/**
+ * @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
+ */
+
+'use strict';
 
 var fs = require('fs');
 var path = require('path');
@@ -45,11 +53,11 @@ function _checkCache(markerFile, cacheMarkerFile) {
  * pull in existing module.
  */
 function _deleteDir(path) {
-  if( fs.existsSync(path) ) {
+  if (fs.existsSync(path)) {
     var subpaths = fs.readdirSync(path);
     subpaths.forEach(function(subpath) {
-      var curPath = path + "/" + subpath;
-      if(fs.lstatSync(curPath).isDirectory()) {
+      var curPath = path + '/' + subpath;
+      if (fs.lstatSync(curPath).isDirectory()) {
         _deleteDir(curPath);
       } else {
         fs.unlinkSync(curPath);
diff --git a/tools/npm/clean-shrinkwrap.js b/tools/npm/clean-shrinkwrap.js
index 3fd05e1c7093..3dc3f6c08ddd 100755
--- a/tools/npm/clean-shrinkwrap.js
+++ b/tools/npm/clean-shrinkwrap.js
@@ -1,4 +1,11 @@
 #!/usr/bin/env node
+/**
+ * @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
+ */
 
 /**
  * this script is just a temporary solution to deal with the issue of npm outputting the npm
@@ -14,25 +21,22 @@ var path = require('path');
 
 
 function cleanModule(moduleRecord, name) {
-
   // keep `resolve` properties for git dependencies, delete otherwise
   delete moduleRecord.from;
   if (!(moduleRecord.resolved && moduleRecord.resolved.match(/^git(\+[a-z]+)?:\/\//))) {
     delete moduleRecord.resolved;
   }
 
-  _.forEach(moduleRecord.dependencies, function(mod, name) {
-    cleanModule(mod, name);
-  });
+  _.forEach(moduleRecord.dependencies, function(mod, name) { cleanModule(mod, name); });
 }
 
 
-//console.log('Reading npm-shrinkwrap.json');
+// console.log('Reading npm-shrinkwrap.json');
 var shrinkwrap = require('../../npm-shrinkwrap.json');
 
-//console.log('Cleaning shrinkwrap object');
+// console.log('Cleaning shrinkwrap object');
 cleanModule(shrinkwrap, shrinkwrap.name);
 
 var cleanShrinkwrapPath = path.join(__dirname, '..', '..', 'npm-shrinkwrap.clean.json');
 console.log('writing npm-shrinkwrap.clean.json');
-fs.writeFileSync(cleanShrinkwrapPath, JSON.stringify(sorted(shrinkwrap), null, 2) + "\n");
+fs.writeFileSync(cleanShrinkwrapPath, JSON.stringify(sorted(shrinkwrap), null, 2) + '\n');
diff --git a/tools/travis/travis-fold.js b/tools/travis/travis-fold.js
index 330a97c7d040..38ac34e30fa3 100644
--- a/tools/travis/travis-fold.js
+++ b/tools/travis/travis-fold.js
@@ -1,3 +1,11 @@
+/**
+ * @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
+ */
+
 module.exports = function travisFoldStart(name) {
   if (process.env.TRAVIS) console.log('travis_fold:start:' + encode(name));
 
diff --git a/tools/tree-shaking-test/rollup.config.js b/tools/tree-shaking-test/rollup.config.js
index b027594f5094..633f476432c4 100644
--- a/tools/tree-shaking-test/rollup.config.js
+++ b/tools/tree-shaking-test/rollup.config.js
@@ -1,6 +1,14 @@
+/**
+ * @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
+ */
+
 class RollupNG2 {
-  resolveId(id, from){
-    if(id.startsWith('@angular/')){
+  resolveId(id, from) {
+    if (id.startsWith('@angular/')) {
       return `${__dirname}/../../packages-dist/${id.split('/')[1]}/esm/index.js`;
     }
 
@@ -10,11 +18,10 @@ class RollupNG2 {
   }
 }
 
-
 export default {
   entry: 'test.js',
   format: 'es6',
   plugins: [
     new RollupNG2(),
   ]
-}
+};

From 58b80910973f47a99d32ea1e34c1cd5f3ec080b6 Mon Sep 17 00:00:00 2001
From: Igor Minar <iminar@google.com>
Date: Wed, 5 Oct 2016 11:37:28 -0700
Subject: [PATCH 69/70] docs(readme): remove incorrect download count badge

npm doesn't currently support download counts for scoped packages, so there is no replacement right now.
---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index c6d25eb346a5..65727f024bb5 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,6 @@
 [![Issue Stats](http://issuestats.com/github/angular/angular/badge/pr?style=flat)](http://issuestats.com/github/angular/angular)
 [![Issue Stats](http://issuestats.com/github/angular/angular/badge/issue?style=flat)](http://issuestats.com/github/angular/angular)
 [![npm version](https://badge.fury.io/js/%40angular%2Fcore.svg)](https://badge.fury.io/js/%40angular%2Fcore)
-[![Downloads](http://img.shields.io/npm/dm/angular2.svg)](https://npmjs.org/package/angular2)
 
 [![Sauce Test Status](https://saucelabs.com/browser-matrix/angular2-ci.svg)](https://saucelabs.com/u/angular2-ci)  
 *Safari (7+), iOS (7+), Edge (14) and IE mobile (11) are tested on [BrowserStack][browserstack].*

From 91f7aa3b154e93e72e16e40b003919f5ff9acd8b Mon Sep 17 00:00:00 2001
From: Chuck Jazdzewski <chuckj@google.com>
Date: Wed, 5 Oct 2016 15:51:49 -0700
Subject: [PATCH 70/70] docs(CHANGELOG): add changelog for 2.0.2

---
 CHANGELOG.md | 23 +++++++++++++++++++++++
 package.json |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77d380efb08e..5b6c83b7a768 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,26 @@
+<a name="2.0.2"></a>
+## [2.0.2](https://github.com/angular/angular/compare/2.0.1...2.0.2) (2016-10-05)
+
+
+### Bug Fixes
+
+* **common:** correctly removes styles on IE ([#11953](https://github.com/angular/angular/pull/11953)), closes [#7916](https://github.com/angular/angular/issues/7916)
+* **compiler:** do not embed templateUrl in view factories in non-debug mode. ([#11818](https://github.com/angular/angular/issues/11818)) ([51e1994](https://github.com/angular/angular/commit/51e1994)), closes [#11117](https://github.com/angular/angular/issues/11117)
+* **compiler:** move detection of unsafe properties for binding to ElementSchemaRegistry ([#11378](https://github.com/angular/angular/issues/11378)) ([5911c3b](https://github.com/angular/angular/commit/5911c3b))
+* **forms:** properly validate empty strings with patterns ([#11450](https://github.com/angular/angular/issues/11450)) ([e00de0c](https://github.com/angular/angular/commit/e00de0c))
+* **http:** preserve case of the first init, `set()` or `append()` ([#12023](https://github.com/angular/angular/issues/12023)) ([adb17fe](https://github.com/angular/angular/commit/adb17fe)), closes [#11624](https://github.com/angular/angular/issues/11624)
+* **compiler-cli:** allow ReflectorHost passed as argument to CodeGenerator#create ([#11951](https://github.com/angular/angular/issues/11951)) ([826c98e](https://github.com/angular/angular/commit/826c98e))
+* **router:** do not reset the router state when updating the component ([#11867](https://github.com/angular/angular/issues/11867)) ([cf750e1](https://github.com/angular/angular/commit/cf750e1))
+* **compiler:** fix `:host(tag)` and `:host-context(tag)` ([a6bb84e0](https://github.com/angular/angular/commit/a6bb84e02b7579f8d957ef6ba5b10d83482ed756)), closes [#11972](https://github.com/angular/angular/issues/11972)
+* **compiler:** fix attribute selectors in :host and :host-context ([#12056](https://github.com/angular/angular/issues/12056)) ([6f7ed32](https://github.com/angular/angular/commit/6f7ed32)), closes [#11917](https://github.com/angular/angular/issues/11917)
+* **compiler:** support `[@page](https://github.com/page)` and `[@document](https://github.com/document)` CSS rules ([#11878](https://github.com/angular/angular/issues/11878)) ([c99ef49](https://github.com/angular/angular/commit/c99ef49)), closes [#11860](https://github.com/angular/angular/issues/11860)
+* **compiler:** support `[attr="value with space"]` ([bd012ef](https://github.com/angular/angular/commit/bd012ef)), closes [#6249](https://github.com/angular/angular/issues/6249)
+* **compiler:** support quoted attribute values ([7395400](https://github.com/angular/angular/commit/7395400)), closes [#6085](https://github.com/angular/angular/issues/6085)
+* **upgrade:** bind optional properties when upgrading from ng1 ([#11411](https://github.com/angular/angular/issues/11411)) ([0851238](https://github.com/angular/angular/commit/0851238)), closes [#10181](https://github.com/angular/angular/issues/10181)
+* **http:** change a behavior when a param value is null or undefined ([#11990](https://github.com/angular/angular/issues/11990)) ([9cc0a4e](https://github.com/angular/angular/commit/9cc0a4e))
+* **compiler:** fix `<x>` ctype names ([7578d85](https://github.com/angular/angular/commit/7578d85)), closes [#12000](https://github.com/angular/angular/issues/12000)
+
+
 <a name="2.0.1"></a>
 ## [2.0.1](https://github.com/angular/angular/compare/2.0.0...2.0.1) (2016-09-23)
 
diff --git a/package.json b/package.json
index 4b0176dbbf08..f1412e1a42cf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-srcs",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "private": true,
   "branchPattern": "2.0.*",
   "description": "Angular 2 - a web framework for modern web apps",