chore(release): v2.0.1

docs(changelog): add changelog for 2.0.1
fix(upgrade): allow attribute selectors for components in ng2 which are not part of upgrade (#11808 )
2016-09-23 11:28:36 -07:00 · 2016-09-23 10:50:42 -07:00 · 2016-09-23 10:48:47 -07:00 · 2016-09-23 10:22:24 -07:00 · 2016-09-23 10:22:05 -07:00 · 2016-09-23 10:21:58 -07:00
936 changed files with 22746 additions and 38758 deletions
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@ -1,7 +1,3 @@
 <!--
 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
@ -9,18 +5,14 @@ IF YOU DON'T FILL OUT THE FOLLOWING INFORMATION WE MIGHT CLOSE YOUR ISSUE WITHOU
 [ ] 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. -->
-**Minimal reproduction of the problem with instructions**
+**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). -->
 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 -->
@ -28,12 +20,12 @@ https://plnkr.co or similar (you can use this template as a starting point: http
 **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` =   
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,283 +1,3 @@
 <a name="2.2.1"></a>
 ## [2.2.1](https://github.com/angular/angular/compare/2.2.0...2.2.1) (2016-11-17)
 ### Bug Fixes
 * **animations:** only pass in same typed players as previous players into web-animations ([#12907](https://github.com/angular/angular/issues/12907)) ([583d283](https://github.com/angular/angular/commit/583d283))
 * **animations:** retain styling when transition destinations are changed ([#12208](https://github.com/angular/angular/issues/12208)) ([5c46c49](https://github.com/angular/angular/commit/5c46c49)), closes [#9661](https://github.com/angular/angular/issues/9661)
 * **core:** support `ngTemplateOutlet` in production mode ([#12921](https://github.com/angular/angular/issues/12921)) ([4628798](https://github.com/angular/angular/commit/4628798)), closes [#12911](https://github.com/angular/angular/issues/12911)
 * **http:** correctly handle response body for 204 status code ([21a4de9](https://github.com/angular/angular/commit/21a4de9)), closes [#12830](https://github.com/angular/angular/issues/12830) [#12393](https://github.com/angular/angular/issues/12393)
 * **http:** return request url if it cannot be retrieved from response ([845ea23](https://github.com/angular/angular/commit/845ea23)), closes [#12837](https://github.com/angular/angular/issues/12837)
 * **upgrade:** make AoT ngUpgrade work with the testability API and resumeBootstrap() ([#12910](https://github.com/angular/angular/issues/12910)) ([dc1662a](https://github.com/angular/angular/commit/dc1662a))
 * **platform-browser:** fix disableDebugTools() ([#12918](https://github.com/angular/angular/issues/12918)) ([7b67bad](https://github.com/angular/angular/commit/7b67bad))
 * **router:** add a banner file for the router ([#12919](https://github.com/angular/angular/issues/12919)) ([364642d](https://github.com/angular/angular/commit/364642d))
 * **router:** removes a peer dependency from router to upgrade ([1dcf1f4](https://github.com/angular/angular/commit/1dcf1f4))
 * **forms** allow for null values in HTML select options bound with ngValue ([e0ce545](https://github.com/angular/angular/commit/e0ce545)), closes [#10349](https://github.com/angular/angular/issues/10349)
 * **router:** should not create a route state if navigation is canceled ([#12868](https://github.com/angular/angular/issues/12868)) ([dabaf85](https://github.com/angular/angular/commit/dabaf85)), closes [#12776](https://github.com/angular/angular/issues/12776)
 * **common:** select should allow for null values in HTML select options bound with ngValue ([e02c180](https://github.com/angular/angular/commit/e02c180)), closes [#12829](https://github.com/angular/angular/issues/12829)
 * **compiler-cli:** support ctorParams in function closure ([#12876](https://github.com/angular/angular/issues/12876)) ([6cdc3b5](https://github.com/angular/angular/commit/6cdc3b5))
 <a name="2.2.0"></a>
 # [2.2.0 upgrade-firebooster](https://github.com/angular/angular/compare/2.2.0-rc.0...2.2.0) (2016-11-14)
 ### Features (summary of all features from 2.2.0-beta.0 - 2.2.0-rc.0 releases)
 * **common:** support narrow forms for month and weekdays in DatePipe ([#12297](https://github.com/angular/angular/issues/12297)) ([f77ab6a](https://github.com/angular/angular/commit/f77ab6a)), closes [#12294](https://github.com/angular/angular/issues/12294)
 * **core:** map 'for' attribute to 'htmlFor' property ([#10546](https://github.com/angular/angular/issues/10546)) ([634b3bb](https://github.com/angular/angular/commit/634b3bb)), closes [#7516](https://github.com/angular/angular/issues/7516)
 * **core:** add the find method to QueryList ([7c16ef9](https://github.com/angular/angular/commit/7c16ef9))
 * **forms:** add hasError and getError to AbstractControlDirective ([#11985](https://github.com/angular/angular/issues/11985)) ([592f40a](https://github.com/angular/angular/commit/592f40a)), closes [#7255](https://github.com/angular/angular/issues/7255)
 * **forms:** add ng-pending CSS class during async validation ([#11243](https://github.com/angular/angular/issues/11243)) ([97bc971](https://github.com/angular/angular/commit/97bc971)), closes [#10336](https://github.com/angular/angular/issues/10336)
 * **forms:** add emitEvent to AbstractControl methods ([#11949](https://github.com/angular/angular/issues/11949)) ([b9fc090](https://github.com/angular/angular/commit/b9fc090))
 * **forms:** make 'parent' a public property of 'AbstractControl' ([#11855](https://github.com/angular/angular/issues/11855)) ([445e592](https://github.com/angular/angular/commit/445e592))
 * **forms:** Validator.pattern accepts a RegExp ([#12323](https://github.com/angular/angular/issues/12323)) ([bf60418](https://github.com/angular/angular/commit/bf60418))
 * **router:** add a provider making angular1/angular2 integration easier ([#12769](https://github.com/angular/angular/issues/12769)) ([6e35d13](https://github.com/angular/angular/commit/6e35d13))
 * **router:** add support for custom url matchers ([7340735](https://github.com/angular/angular/commit/7340735)), closes [#12442](https://github.com/angular/angular/issues/12442) [#12772](https://github.com/angular/angular/issues/12772)
 * **router:** export routerLinkActive w/ isActive property ([c9f58cf](https://github.com/angular/angular/commit/c9f58cf))
 * **router:** add support for ng1/ng2 migration ([#12160](https://github.com/angular/angular/issues/12160)) ([8b9ab44](https://github.com/angular/angular/commit/8b9ab44))
 * **upgrade:** add support for AoT compiled upgrade applications ([d6791ff](https://github.com/angular/angular/commit/d6791ff)), closes [#12239](https://github.com/angular/angular/issues/12239)
 * **upgrade:** add support for `require` in UpgradeComponent ([fe1d0e2](https://github.com/angular/angular/commit/fe1d0e2))
 * **upgrade:** add/improve support for lifecycle hooks in UpgradeComponent ([469010e](https://github.com/angular/angular/commit/469010e))
 ### Performance Improvements
 * **compiler:** introduce direct rendering ([9c23884](https://github.com/angular/angular/commit/9c23884))
 * **core:** don’t use `DomAdapter` nor zone for regular events ([648ce59](https://github.com/angular/angular/commit/648ce59))
 * **core:** use `array.push` / `array.pop` instead of `splice` if possible ([0fc11a4](https://github.com/angular/angular/commit/0fc11a4))
 * **platform-browser:** cache plugin resolution in the EventManager ([73593d4](https://github.com/angular/angular/commit/73593d4)), closes [#12824](https://github.com/angular/angular/issues/12824)
 * **platform-browser:** don’t use `DomAdapter` any more ([d708a88](https://github.com/angular/angular/commit/d708a88))
 ### Bug Fixes
 * **animations:** allow animations to be destroyed manually ([#12719](https://github.com/angular/angular/issues/12719)) ([fe35bc3](https://github.com/angular/angular/commit/fe35bc3)), closes [#12456](https://github.com/angular/angular/issues/12456)
 * **animations:** always normalize style properties and values during compilation ([#12755](https://github.com/angular/angular/issues/12755)) ([a0e9fde](https://github.com/angular/angular/commit/a0e9fde)), closes [#11582](https://github.com/angular/angular/issues/11582) [#12481](https://github.com/angular/angular/issues/12481)
 * **animations:** always trigger animations after the change detection check ([#12713](https://github.com/angular/angular/issues/12713)) ([383f23b](https://github.com/angular/angular/commit/383f23b))
 * **animations:** ensure animations work with web-workers ([#12656](https://github.com/angular/angular/issues/12656)) ([19e869e](https://github.com/angular/angular/commit/19e869e))
 * **animations:** ensure web-animations are caught within the Angular zone ([f80a157](https://github.com/angular/angular/commit/f80a157)), closes [#11881](https://github.com/angular/angular/issues/11881) [#11712](https://github.com/angular/angular/issues/11712) [#12355](https://github.com/angular/angular/issues/12355) [#11881](https://github.com/angular/angular/issues/11881) [#12546](https://github.com/angular/angular/issues/12546) [#12707](https://github.com/angular/angular/issues/12707) [#12774](https://github.com/angular/angular/issues/12774)
 * **common:** `NgSwitch` - don’t create the default case if another case matches ([#12726](https://github.com/angular/angular/issues/12726)) ([d8f23f4](https://github.com/angular/angular/commit/d8f23f4)), closes [#11297](https://github.com/angular/angular/issues/11297) [#9420](https://github.com/angular/angular/issues/9420)
 * **common:** I18nSelectPipe selects other case on default ([4708b24](https://github.com/angular/angular/commit/4708b24))
 * **common:** no TZ Offset added by DatePipe for dates without time ([#12380](https://github.com/angular/angular/issues/12380)) ([2aba8b0](https://github.com/angular/angular/commit/2aba8b0))
 * **common:** NgClass should throw a descriptive error when CSS class is not a string ([#12662](https://github.com/angular/angular/issues/12662)) ([f3793b5](https://github.com/angular/angular/commit/f3793b5)), closes [#12586](https://github.com/angular/angular/issues/12586)
 * **common:** DatePipe should handle empty string ([#12374](https://github.com/angular/angular/issues/12374)) ([3dc6177](https://github.com/angular/angular/commit/3dc6177))
 * **compiler:** don't convert undefined to null literals ([#11503](https://github.com/angular/angular/issues/11503)) ([f0cdb42](https://github.com/angular/angular/commit/f0cdb42)), closes [#11493](https://github.com/angular/angular/issues/11493)
 * **compiler:** generate safe access strictNullChecks compatible code ([#12800](https://github.com/angular/angular/issues/12800)) ([a965d11](https://github.com/angular/angular/commit/a965d11)), closes [#12795](https://github.com/angular/angular/issues/12795)
 * **compiler:** support more than 9 interpolations ([#12710](https://github.com/angular/angular/issues/12710)) ([22c021c](https://github.com/angular/angular/commit/22c021c)), closes [#10253](https://github.com/angular/angular/issues/10253)
 * **compiler:** use the other case by default in ICU messages ([55dc0e4](https://github.com/angular/angular/commit/55dc0e4))
 * **compiler-cli:** suppress closure compiler suspiciousCode check in codegen ([#12666](https://github.com/angular/angular/issues/12666)) ([7103754](https://github.com/angular/angular/commit/7103754))
 * **compiler-cli:** suppress two more closure compiler checks in codegen ([#12698](https://github.com/angular/angular/issues/12698)) ([77cbf7f](https://github.com/angular/angular/commit/77cbf7f))
 * **core:** allow to query content of templates that are stamped out at a different place ([f2bbef3](https://github.com/angular/angular/commit/f2bbef3)), closes [#12283](https://github.com/angular/angular/issues/12283) [#12094](https://github.com/angular/angular/issues/12094)
 * **core:** apply host attributes to root elements ([#12761](https://github.com/angular/angular/issues/12761)) ([ad3bf6c](https://github.com/angular/angular/commit/ad3bf6c)), closes [#12744](https://github.com/angular/angular/issues/12744)
 * **core:** ensure that component views that have no bindings recurse into nested components / view containers. ([051d748](https://github.com/angular/angular/commit/051d748))
 * **core:** fix pseudo-selector shimming ([#12754](https://github.com/angular/angular/issues/12754)) ([acbf1d8](https://github.com/angular/angular/commit/acbf1d8)), closes [#12730](https://github.com/angular/angular/issues/12730) [#12354](https://github.com/angular/angular/issues/12354)
 * **forms:** check if registerOnValidatorChange exists on validator before trying to invoke it ([#12801](https://github.com/angular/angular/issues/12801)) ([ef88147](https://github.com/angular/angular/commit/ef88147)), closes [#12593](https://github.com/angular/angular/issues/12593)
 * **forms:** getRawValue returns any instead of Object ([#12599](https://github.com/angular/angular/issues/12599)) ([09092ac](https://github.com/angular/angular/commit/09092ac))
 * **http:** preserve header case when copying headers ([#12697](https://github.com/angular/angular/issues/12697)) ([121e508](https://github.com/angular/angular/commit/121e508))
 * **router:** advance a route only after its children have been deactivated ([#12676](https://github.com/angular/angular/issues/12676)) ([9ddf9b3](https://github.com/angular/angular/commit/9ddf9b3)), closes [#11715](https://github.com/angular/angular/issues/11715)
 * **router:** avoid router initialization for non root components ([2a4bf9a](https://github.com/angular/angular/commit/2a4bf9a)), closes [#12338](https://github.com/angular/angular/issues/12338) [#12814](https://github.com/angular/angular/issues/12814)
 * **router:** check if windows.console exists before using it ([#12348](https://github.com/angular/angular/issues/12348)) ([7886561](https://github.com/angular/angular/commit/7886561))
 * **router:** correctly export concatMap operator in es5 ([#12430](https://github.com/angular/angular/issues/12430)) ([e25baa0](https://github.com/angular/angular/commit/e25baa0))
 * **router:** do not require the creation of empty-path routes when no url left ([2c11093](https://github.com/angular/angular/commit/2c11093)), closes [#12133](https://github.com/angular/angular/issues/12133)
 * **router:** ignore null or undefined query parameters ([#12333](https://github.com/angular/angular/issues/12333)) ([3052fb2](https://github.com/angular/angular/commit/3052fb2))
 * **router:** incorrect injector is used when instantiating components loaded lazily ([#12817](https://github.com/angular/angular/issues/12817)) ([52be848](https://github.com/angular/angular/commit/52be848))
 * **router:** resolve guard observables on the first emit ([#10412](https://github.com/angular/angular/issues/10412)) ([2e78b76](https://github.com/angular/angular/commit/2e78b76))
 * **router:** Route.isActive also compares query params ([#12321](https://github.com/angular/angular/issues/12321)) ([785b7b6](https://github.com/angular/angular/commit/785b7b6))
 * **router:** router should not swallow "unhandled" errors ([e5a753e](https://github.com/angular/angular/commit/e5a753e)), closes [#12802](https://github.com/angular/angular/issues/12802)
 * **router:** throw an error when encounter undefined route ([#12389](https://github.com/angular/angular/issues/12389)) ([77dc1ab](https://github.com/angular/angular/commit/77dc1ab))
 * **platform-browser:** enableDebugTools should create AngularTools by merging into context.ng ([#12003](https://github.com/angular/angular/issues/12003)) ([b2cf379](https://github.com/angular/angular/commit/b2cf379)), closes [#12002](https://github.com/angular/angular/issues/12002)
 * **platform-browser:** provide the ability to register global hammer.js events ([768cddb](https://github.com/angular/angular/commit/768cddb)), closes [#12797](https://github.com/angular/angular/issues/12797)
 * **tsc-wrapped:** harden collector against invalid asts ([#12793](https://github.com/angular/angular/issues/12793)) ([69f87ca](https://github.com/angular/angular/commit/69f87ca))
 <a name="2.2.0-rc.0"></a>
 # [2.2.0-rc.0](https://github.com/angular/angular/compare/2.2.0-beta.1...2.2.0-rc.0) (2016-11-02)
 ### Bug Fixes
 * **compiler:** dedupe NgModule declarations, … ([a178bc6](https://github.com/angular/angular/commit/a178bc6))
 * **compiler:** don’t double bind functions ([e391cac](https://github.com/angular/angular/commit/e391cac))
 * **compiler:** Don’t throw on empty property bindings ([642c1db](https://github.com/angular/angular/commit/642c1db)), closes [#12583](https://github.com/angular/angular/issues/12583)
 * **compiler:** support multiple components in a view container ([6fda972](https://github.com/angular/angular/commit/6fda972))
 * **core:** improve error when multiple components match the same element ([e9fd864](https://github.com/angular/angular/commit/e9fd864)), closes [#7067](https://github.com/angular/angular/issues/7067)
 * **router:** call data observers when the path changes ([1de04b2](https://github.com/angular/angular/commit/1de04b2))
 * **router:** CanDeactivate receives a wrong component ([830a780](https://github.com/angular/angular/commit/830a780)), closes [#12592](https://github.com/angular/angular/issues/12592)
 * **router:** rerun resolvers when url changes ([fe47e6b](https://github.com/angular/angular/commit/fe47e6b)), closes [#12603](https://github.com/angular/angular/issues/12603)
 * **router:** reset URL to the stable state when a navigation gets canceled ([d509ee0](https://github.com/angular/angular/commit/d509ee0)), closes [#10321](https://github.com/angular/angular/issues/10321)
 * **router:** routerLink should not prevent default on non-link elements ([8e221b8](https://github.com/angular/angular/commit/8e221b8))
 * **router:** run navigations serially ([091c390](https://github.com/angular/angular/commit/091c390)), closes [#11754](https://github.com/angular/angular/issues/11754)
 * **upgrade:** silent bootstrap failures ([fa93fd6](https://github.com/angular/angular/commit/fa93fd6)), closes [#12062](https://github.com/angular/angular/issues/12062)
 ### Features
 * **core:** add the find method to QueryList ([7c16ef9](https://github.com/angular/angular/commit/7c16ef9))
 <a name="2.1.2"></a>
 # [2.1.2](https://github.com/angular/angular/compare/2.1.1...2.1.2) (2016-10-27)
 ### Bug Fixes
 * **compiler:** don't access view local variables nor pipes in host expressions ([#12396](https://github.com/angular/angular/issues/12396)) ([867494a](https://github.com/angular/angular/commit/867494a)), closes [#12004](https://github.com/angular/angular/issues/12004) [#12071](https://github.com/angular/angular/issues/12071)
 * **compiler:** walk third party modules ([#12453](https://github.com/angular/angular/issues/12453)) ([a838aba](https://github.com/angular/angular/commit/a838aba)), closes [#11889](https://github.com/angular/angular/issues/11889) [#12428](https://github.com/angular/angular/issues/12428)
 * **compiler:** remove double exports of template_ast ([7742ec0](https://github.com/angular/angular/commit/7742ec0))
 * **compiler:** use Maps instead of objects in selector implementation ([d321b0e](https://github.com/angular/angular/commit/d321b0e))
 * **compiler-cli:** fix types ([ef15364](https://github.com/angular/angular/commit/ef15364))
 * **compiler-cli:** assert that all pipes and directives are declared by a module  ([7221632](https://github.com/angular/angular/commit/7221632))
 * **http:** overwrite already set xsrf header ([b4265e0](https://github.com/angular/angular/commit/b4265e0))
 * **router:** add a test to make sure canDeactivate guards are called for aux routes ([fc60fa7](https://github.com/angular/angular/commit/fc60fa7)), closes [#11345](https://github.com/angular/angular/issues/11345)
 * **router:** canDeactivate guards are not triggered for componentless routes ([b741853](https://github.com/angular/angular/commit/b741853)), closes [#12375](https://github.com/angular/angular/issues/12375)
 * **router:** change router not to deactivate aux routes when navigating from a componentless routes ([52a853e](https://github.com/angular/angular/commit/52a853e))
 * **router:** disallow component routes with named outlets ([8f2fa0f](https://github.com/angular/angular/commit/8f2fa0f)), closes [#11208](https://github.com/angular/angular/issues/11208) [#11082](https://github.com/angular/angular/issues/11082)
 * **router:** preserve resolve data ([6ccbfd4](https://github.com/angular/angular/commit/6ccbfd4)), closes [#12306](https://github.com/angular/angular/issues/12306)
 <a name="2.2.0-beta.1"></a>
 # [2.2.0-beta.1](https://github.com/angular/angular/compare/2.2.0-beta.0...2.2.0-beta.1) (2016-10-27)
 ### Code Refactoring
 * **upgrade:** re-export the new static upgrade APIs on new entry ([a26dd28](https://github.com/angular/angular/commit/a26dd28))
 ### Features
 * **router:** export routerLinkActive w/ isActive property ([c9f58cf](https://github.com/angular/angular/commit/c9f58cf))
 ### BREAKING CHANGES (only for beta version users)
 * upgrade: Four newly added APIs in 2.2.0-beta:
 downgradeComponent, downgradeInjectable, UpgradeComponent, and UpgradeModule are no longer exported by @angular/upgrade.
 Import these from @angular/upgrade/static instead.
 Note: The 2.2.0-beta.1 release also contains all the changes present in the 2.1.2 release.
 # [2.1.1](https://github.com/angular/angular/compare/2.1.0...2.1.1) (2016-10-20)
 ### Bug Fixes
 * **compiler:** generate aot code for animation trigger output events ([#12291](https://github.com/angular/angular/issues/12291)) ([6e5f8b5](https://github.com/angular/angular/commit/6e5f8b5)), closes [#11707](https://github.com/angular/angular/issues/11707)
 * **compiler:** don't redeclare a var in the same scope ([#12386](https://github.com/angular/angular/issues/12386)) ([cca4a5c](https://github.com/angular/angular/commit/cca4a5c))
 * **core:** fix decorator default values ([bd1dcb5](https://github.com/angular/angular/commit/bd1dcb5))
 * **core:** fix property decorators ([3993279](https://github.com/angular/angular/commit/3993279)), closes [#12224](https://github.com/angular/angular/issues/12224)
 * **http:** make normalizeMethodName optimizer-compatible. ([#12370](https://github.com/angular/angular/issues/12370)) ([8409b65](https://github.com/angular/angular/commit/8409b65))
 * **router:** correctly export filter operator in es5 ([#12286](https://github.com/angular/angular/issues/12286)) ([27d7677](https://github.com/angular/angular/commit/27d7677))
 * **router:** do not update primary route if only secondary outlet is given ([#11797](https://github.com/angular/angular/issues/11797)) ([da5fc69](https://github.com/angular/angular/commit/da5fc69))
 * **router:** fix lazy loading triggered by redirects from wildcard routes ([5ae6915](https://github.com/angular/angular/commit/5ae6915)), closes [#12183](https://github.com/angular/angular/issues/12183)
 * **router:** module loader should start compiling modules when stubbedModules are set ([#11742](https://github.com/angular/angular/issues/11742)) ([b44b6ef](https://github.com/angular/angular/commit/b44b6ef))
 ### Performance Improvements
 * **common:** optimize NgSwitch default case ([fdf4309](https://github.com/angular/angular/commit/fdf4309))
 <a name="2.2.0-beta.0"></a>
 # [2.2.0-beta.0](https://github.com/angular/angular/compare/2.1.0...2.2.0-beta.0) (2016-10-20)
 ### Features
 * **common:** support narrow forms for month and weekdays in DatePipe ([#12297](https://github.com/angular/angular/issues/12297)) ([f77ab6a](https://github.com/angular/angular/commit/f77ab6a)), closes [#12294](https://github.com/angular/angular/issues/12294)
 * **forms:** add hasError and getError to AbstractControlDirective ([#11985](https://github.com/angular/angular/issues/11985)) ([592f40a](https://github.com/angular/angular/commit/592f40a)), closes [#7255](https://github.com/angular/angular/issues/7255)
 * **forms:** add ng-pending CSS class during async validation ([#11243](https://github.com/angular/angular/issues/11243)) ([97bc971](https://github.com/angular/angular/commit/97bc971)), closes [#10336](https://github.com/angular/angular/issues/10336)
 * **forms:** Added emitEvent to AbstractControl methods ([#11949](https://github.com/angular/angular/issues/11949)) ([b9fc090](https://github.com/angular/angular/commit/b9fc090))
 * **forms:** make 'parent' a public property of 'AbstractControl' ([#11855](https://github.com/angular/angular/issues/11855)) ([445e592](https://github.com/angular/angular/commit/445e592))
 * **forms:** Validator.pattern accepts a RegExp ([#12323](https://github.com/angular/angular/issues/12323)) ([bf60418](https://github.com/angular/angular/commit/bf60418))
 * **upgrade:** add support for AoT compiled upgrade applications ([d6791ff](https://github.com/angular/angular/commit/d6791ff)), closes [#12239](https://github.com/angular/angular/issues/12239)
 * **router:** add support for ng1/ng2 migration ([#12160](https://github.com/angular/angular/issues/12160)) ([8b9ab44](https://github.com/angular/angular/commit/8b9ab44))
 Note: The 2.2.0-beta.0 release also contains all the changes present in the 2.1.1 release.
 <a name="2.1.0"></a>
 # [2.1.0 incremental-metamorphosis](https://github.com/angular/angular/compare/2.1.0-rc.0...2.1.0) (2016-10-12)
 ### Bug Fixes
 * **compiler:** allow whitespace as `<ng-content>` content ([#12225](https://github.com/angular/angular/issues/12225)) ([df1718d](https://github.com/angular/angular/commit/df1718d))
 * **compiler:** interpolation expressions report the correct offset ([#12125](https://github.com/angular/angular/issues/12125)) ([d641c36](https://github.com/angular/angular/commit/d641c36))
 * **compiler:** properly shim `:host:before` and `:host(:before)` ([#12171](https://github.com/angular/angular/issues/12171)) ([aa92512](https://github.com/angular/angular/commit/aa92512)), closes [#12165](https://github.com/angular/angular/issues/12165)
 * **compiler:** validate `@HostBinding` name ([#12139](https://github.com/angular/angular/issues/12139)) ([13ecc14](https://github.com/angular/angular/commit/13ecc14))
 * **compiler-cli:** don't clone static symbols when simplifying annotation metadata ([#12158](https://github.com/angular/angular/issues/12158)) ([8c477b2](https://github.com/angular/angular/commit/8c477b2))
 * **compiler-cli:** remove peerDependency on [@angular](https://github.com/angular)/platform-server ([#12122](https://github.com/angular/angular/issues/12122)) ([71b7654](https://github.com/angular/angular/commit/71b7654))
 * **compiler-cli:** remove unused parse5 dependency from package.json ([eaaec69](https://github.com/angular/angular/commit/eaaec69))
 * **forms:** allow optional fields with pattern and minlength validators ([#12147](https://github.com/angular/angular/issues/12147)) ([d22eeb7](https://github.com/angular/angular/commit/d22eeb7))
 * **forms:** properly validate blank strings with minlength ([#12091](https://github.com/angular/angular/issues/12091)) ([f50c1da](https://github.com/angular/angular/commit/f50c1da))
 * **http:** fix Headers initialization from Headers and Object ([#12106](https://github.com/angular/angular/issues/12106)) ([f4566f8](https://github.com/angular/angular/commit/f4566f8))
 * **http:** Headers.append should append to the list ([a67c067](https://github.com/angular/angular/commit/a67c067))
 * **platform-browser-dynamic:** mark platformBrowserDynamic as stable API ([#12154](https://github.com/angular/angular/issues/12154)) ([bcef5ef](https://github.com/angular/angular/commit/bcef5ef))
 * **router:** improve error message ([#12102](https://github.com/angular/angular/issues/12102)) ([e06303a](https://github.com/angular/angular/commit/e06303a))
 * **router:** parent resolve should complete before merging resolved data ([1681e4f](https://github.com/angular/angular/commit/1681e4f)), closes [#12032](https://github.com/angular/angular/issues/12032)
 * **router:** wildcards routes should support lazy loading ([40b92dd](https://github.com/angular/angular/commit/40b92dd)), closes [#12024](https://github.com/angular/angular/issues/12024)
 * **upgrade:** allow compilerOptions in bootstrap ([#10575](https://github.com/angular/angular/issues/10575)) ([5effc33](https://github.com/angular/angular/commit/5effc33))
 <a name="2.1.0-rc.0"></a>
 # [2.1.0-rc.0](https://github.com/angular/angular/compare/2.1.0-beta.0...2.1.0-rc.0) (2016-10-05)
 ### Features
 * **animations:** provide aliases for `:enter` and `:leave` transitions ([#11991](https://github.com/angular/angular/issues/11991)) ([e884f48](https://github.com/angular/angular/commit/e884f48))
 Note: 2.1.0-rc.0 release also contains all the changes present in the 2.0.2 release.
 <a name="2.1.0-beta.0"></a>
 # [2.1.0-beta.0](https://github.com/angular/angular/compare/2.0.0...2.1.0-beta.0) (2016-09-23)
 ### Features
 * **router:** add router preloader to optimistically preload routes ([5a84982](https://github.com/angular/angular/commit/5a84982))
 ### Bug Fixes
 * **router:** update the router not to reset router state when updating root component ([#11799](https://github.com/angular/angular/issues/11799)) ([31dce72](https://github.com/angular/angular/commit/31dce72))
 Note: 2.1.0-beta.0 release also contains all the changes present in the 2.0.1 release.
 <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))
 * **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` and `@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)
 * **compiler:** fix `<x>` ctype names ([7578d85](https://github.com/angular/angular/commit/7578d85)), closes [#12000](https://github.com/angular/angular/issues/12000)
 * **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))
 * **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)
 * **http:** remove url params if provided value is null or undefined ([#11990](https://github.com/angular/angular/issues/11990)) ([9cc0a4e](https://github.com/angular/angular/commit/9cc0a4e))
 * **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))
 * **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)
 <a name="2.0.1"></a>
 ## [2.0.1](https://github.com/angular/angular/compare/2.0.0...2.0.1) (2016-09-23)
@ -289,7 +9,7 @@ Note: 2.1.0-beta.0 release also contains all the changes present in the 2.0.1 re
 * **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 [#11645](https://github.com/angular/angular/issues/11645)
+* **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))
@ -298,7 +18,7 @@ Note: 2.1.0-beta.0 release also contains all the changes present in the 2.0.1 re
 <a name="2.0.0"></a>
-# [2.0.0 proprioception-reinforcement](https://github.com/angular/angular/compare/2.0.0-rc.7...2.0.0) (2016-09-14)
+# [2.0.0](https://github.com/angular/angular/compare/2.0.0-rc.7...2.0.0) (2016-09-14)
 ### Bug Fixes
@ -511,7 +231,7 @@ Note: 2.1.0-beta.0 release also contains all the changes present in the 2.0.1 re
 use `Type<any>` in place of `Type`.
  We don't expect that any user applications use the `Type` type directly.
-
+  
 * core: Previously inconsistently named APIs SanitizationService and DomSanitizationService were renamed to Sanitizer and DomSanitizer
 * core: previously deprecated @Component.directives and @Component.pipes support was removed.
@ -525,11 +245,11 @@ use `Type<any>` in place of `Type`.
 * core: deprecated ComponentResolver was removed. Please use ComponentFactoryResolver instead.
 * core: animations defined using an at-symbol prefix that are not property bound are now invalid.
-
+  
  ```html
  <!-- this is now invalid -->
  <div @flip="flipState"></div>
-
+  
  <!-- change that to -->
  <div [@flip]="flipState"></div>
  ```
@ -555,7 +275,7 @@ prefix using `animate-` must now be preixed using `bind-animate-`.
  ```
  {provide: MyClass, useFactory: ...}
  ```
-
+  
 * core: previously deprecated NgZoneError has been removed
 * core: Exceptions are no longer part of the public API. We don't expect that anyone should be referring to the Exception types.
@ -567,7 +287,7 @@ prefix using `animate-` must now be preixed using `bind-animate-`.
  ```
  ErrorHandler.handleError(error: any): void;
  ```
-
+  
 * core: deprecated DynamicComponentLoader was removed; see deprecation notice for migration instructions.
 * core: deprecated SystemJsComponentResolver and SystemJsCmpFactoryResolver have been removed.
@ -601,13 +321,13 @@ prefix using `animate-` must now be preixed using `bind-animate-`.
 * platform-browser-dynamic: `CACHED_TEMPLATE_PROVIDER` is now renamed to `RESOURCE_CACHE_PROVIDER`
  Before:
-
+  
  ```js
  import {CACHED_TEMPLATE_PROVIDER} from '@angular/platform-browser-dynamic';
  ```
-
+  
  After:
-
+  
  ```js
  import {RESOURCE_CACHE_PROVIDER} from '@angular/platform-browser-dynamic';
  ```
@ -625,7 +345,7 @@ prefix using `animate-` must now be preixed using `bind-animate-`.
 * webworkers: web worker platform is now exported via separate packages.
  Please use @angular/platform-webworker and @angular/platform-webworker-dynamic
-
+  
 <a name="2.0.0-rc.5"></a>
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -1,6 +1,6 @@
-# Contributing to Angular
+# Contributing to Angular 2
-We would love for you to contribute to Angular and help make it even better than it is
+We would love for you to contribute to Angular 2 and help make it even better than it is
 today! As a contributor, here are the guidelines we would like you to follow:
 - [Code of Conduct](#coc)
@ -17,26 +17,17 @@ Help us keep Angular open and inclusive. Please read and follow our [Code of Con
 ## <a name="question"></a> Got a Question or Problem?
-Please, do not open issues for the general support questions as we want to keep GitHub issues for bug reports and feature requests. You've got much better chances of getting your question answered on [StackOverflow](https://stackoverflow.com/questions/tagged/angular) where the questions should be tagged with tag `angular`.
+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 the Angular team's capacity to answer usage questions is limited. We are also available on [Gitter][gitter].
-StackOverflow is a much better place to ask questions since:
+## <a name="issue"></a> Found an Issue?
 - there are thousands of people willing to help on StackOverflow
 - questions and answers stay available for public viewing so your question / answer might help someone else
 - StackOverflow's voting system assures that the best answers are prominently visible.
 To save your and our time we will be systematically closing all the issues that are requests for general support and redirecting people to StackOverflow.
 If you would like to chat about the question in real-time, you can reach out via [our gitter channel][gitter].
 ## <a name="issue"></a> Found a Bug?
 If you find a bug in the source code, you can help us by
 [submitting an issue](#submit-issue) to our [GitHub Repository][github]. Even better, you can
 [submit a Pull Request](#submit-pr) with a fix.
-## <a name="feature"></a> Missing a Feature?
+## <a name="feature"></a> Want a Feature?
-You can *request* a new feature by [submitting an issue](#submit-issue) to our GitHub
+You can *request* a new feature by [submitting an issue](#submit-issue) to our [GitHub
-Repository. If you would like to *implement* a new feature, please submit an issue with
+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.
 Please consider what kind of change it is:
@ -48,22 +39,24 @@ and help you to craft the change so that it is successfully accepted into the pr
 ## <a name="submit"></a> Submission Guidelines
 ### <a name="submit-issue"></a> Submitting an Issue
 Before you submit an issue, search the archive, maybe your question was already answered.
-Before you submit an issue, please search the issue tracker, maybe an issue for your problem already exists and the discussion might inform you of workarounds readily available.
+If your issue appears to be a bug, and hasn't been reported, open a new issue.
 Help us to maximize the effort we can spend fixing issues and adding new
 features, by not reporting duplicate issues.  Providing the following information will increase the
 chances of your issue being dealt with quickly:
-We want to fix all the issues as soon as possible, but before fixing a bug we need to reproduce and confirm it. In order to reproduce bugs we will systematically ask you to provide a minimal reproduction scenario using http://plnkr.co. Having a live, reproducible scenario gives us wealth of important information without going back & forth to you with additional questions like:
+* **Overview of the Issue** - if an error is being thrown a non-minified stack trace helps
 * **Angular Version** - what version of Angular is affected (e.g. 2.0.0-alpha.53)
 * **Motivation for or Use Case** - explain what are you trying to do and why the current behavior is a bug for you
 * **Browsers and Operating System** - is this a problem with all browsers?
 * **Reproduce the Error** - provide a live example (using [Plunker][plunker],
  [JSFiddle][jsfiddle] or [Runnable][runnable]) or a unambiguous set of steps
 * **Related Issues** - has a similar issue been reported before?
 * **Suggest a Fix** - if you can't fix the bug yourself, perhaps you can point to what might be
  causing the problem (line of code or commit)
- version of Angular used
+You can file new issues by providing the above information [here](https://github.com/angular/angular/issues/new).
 - 3rd-party libraries and their versions
 - and most importantly - a use-case that fails
 A minimal reproduce scenario using http://plnkr.co/ allows us to quickly confirm a bug (or point out coding problem) as well as confirm that we are fixing the right problem. If plunker is not a suitable way to demostrate the problem (for example for issues related to our npm packaging), please create a standalone git repository demostrating the problem.
 We will be insisting on a minimal reproduce scenario in order to save maintainers time and ultimately be able to fix more bugs. Interestingly, from our experience users often find coding problems themselves while preparing a minimal plunk. We understand that sometimes it might be hard to extract essentials bits of code from a larger code-base but we really need to isolate the problem before we can fix it.
 Unfortunately we are not able to investigate / fix bugs without a minimal reproduction, so if we don't hear back from you we are going to close an issue that don't have enough info to be reproduced.
 You can file new issues by filling out our [new issue form](https://github.com/angular/angular/issues/new).
 ### <a name="submit-pr"></a> Submitting a Pull Request (PR)
@ -101,7 +94,7 @@ Before you submit your Pull Request (PR) consider the following guidelines:
 * In GitHub, send a pull request to `angular:master`.
 * If we suggest changes then:
  * Make the required updates.
-  * Re-run the Angular test suites to ensure tests are still passing.
+  * Re-run the Angular 2 test suites to ensure tests are still passing.
  * Rebase your branch and force push to your GitHub repository (this will update your Pull Request):
    ```shell
--- 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 suites described above fails.
+- Travis CI fails if any of the test suite describe above fails.
 ## Update the public API tests
--- a/README.md
+++ b/README.md
@ -4,6 +4,7 @@
 [![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].*
--- a/SAVED_REPLIES.md
+++ b/SAVED_REPLIES.md
@ -1,62 +0,0 @@
 # Saved Responses for Angular's Issue Tracker
 The following are canned responses that the Angular team should use to close issues on our issue tracker that fall into the listed resolution categories.
 Since GitHub currently doesn't allow us to have a repository-wide or organization-wide list of [saved replies](https://help.github.com/articles/working-with-saved-replies/), these replies need to be maintained by individual team members. Since the responses can be modified in the future, all responses are versioned to simplify the process of keeping the responses up to date.
 ## Angular: Already Fixed (v1)
 ```
 Thanks for reporting this issue. Luckily it has already been fixed in one of the recent releases. Please update to the most recent version to resolve the problem.
 If after upgrade the problem still exists in your application please open a new issue and provide a plunker reproducing the problem and describing the difference between the expected and current behavior. You can use this plunker template: http://plnkr.co/edit/tpl:AvJOMERrnz94ekVua0u5?p=catalogue
 ```
 ## Angular: Don't Understand (v1)
 ```
 I'm sorry but we don't understand the problem you are reporting.
 If the problem still exists please open a new issue and provide a plunker reproducing the problem and describing the difference between the expected and current behavior. You can use this plunker template: http://plnkr.co/edit/tpl:AvJOMERrnz94ekVua0u5?p=catalogue
 ```
 ## Angular: Duplicate (v1)
 ```
 Thanks for reporting this issue. However this issue is a duplicate of an existing issue #<ISSUE_NUMBER>. Please subscribe to that issue for future updates.
 ```
 ## Angular: Insufficient Information Provided (v1)
 ```
 Thanks for reporting this issue. However, you didn't provide sufficient information for us to understand and reproduce the problem. Please check out [our submission guidelines](https://github.com/angular/angular/blob/master/CONTRIBUTING.md#-submitting-an-issue) to understand why we can't act on issues that are lacking important information.
 If the problem still persists, please file a new issue and ensure you provide all of the required information when filling out the issue template.
 ```
 ## Angular: Issue Outside of Angular (v1)
 ```
 I'm sorry but this issue is not caused by Angular. Please contact the author(s) of project <PROJECT NAME> or file issue on their issue tracker.
 ```
 ## Angular: Non-reproducible (v1)
 ```
 I'm sorry but we can't reproduce the problem following the instructions you provided.
 If the problem still exists please open a new issue following [our submission guidelines](https://github.com/angular/angular/blob/master/CONTRIBUTING.md#-submitting-an-issue).
 ```
 ## Angular: Obsolete (v1)
 ```
 Thanks for reporting this issue. This issue is now obsolete due to changes in the recent releases. Please update to the most recent Angular version.
 If the problem still persists, please file a new issue and ensure you provide the version of Angular affected and include the steps to reproduce the problem when filling out the issue template.
 ```
 ## Angular: Support Request (v1)
 ```
 Hello, we reviewed this issue and determined that it doesn't fall into the bug report or feature request category. This issue tracker is not suitable for support requests, please repost your issue on [StackOverflow](http://stackoverflow.com/) using tag `angular`.
 If you are wondering why we don't resolve support issues via the issue tracker, please [check out this explanation](https://github.com/angular/angular/blob/master/CONTRIBUTING.md#-got-a-question-or-problem).
 ```
--- a/TRIAGE_AND_LABELS.md
+++ b/TRIAGE_AND_LABELS.md
@ -1,7 +1,7 @@
 # Triage Process and Github Labels for Angular 2
 This document describes how the Angular team uses labels and milestones 
-to triage issues on github. The basic idea of the process is that
+to triage issues on github. The basic idea of the new process is that 
 caretaker only assigns a component and type (bug, feature) label. The 
 owner of the component than is in full control of how the issues should 
 be triaged further.
@ -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: zones`: `@mhevery`
+* `comp: zone`: `@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: docs`: `@naomiblack`
+* `comp: documentation`: `@naomiblack`
-* `comp: packaging`: `@IgorMinar`
+* `comp: packaging`: `@mhevery`
 * `comp: performance`: `@tbosch`
 * `comp: security`: `@IgorMinar`
@ -53,11 +53,11 @@ What kind of problem is this?
 ## Caretaker Triage Process
-It is the caretaker's responsibility to assign `comp:  *` to each new
+It is the caretaker's responsibility to assign `comp:  *` and `type: *`
-issue as they come in. The reason why we limit the responsibility of the
+to each new issue as they come in. The reason why we limit the 
-caretaker to this one label is that it is likely that without domain
+responsibility of the caretaker to these two labels is that it is 
-knowledge the caretaker could mislabel issues or lack knowledge of
+unlikely that without domain knowledge the caretaker could add any 
-duplicate issues.
+additional labels of value.
 ## Component's owner Triage Process
@ -68,37 +68,11 @@ process for their component.
 It will be up to the component owner to determine the order in which the
 issues within the component will be resolved.
 Several owners have adopted the issue categorization based on
 [user pain](http://www.lostgarden.com/2008/05/improving-bug-triage-with-user-pain.html)
 used by Angular 1. In this system every issue is assigned frequency and
 severity based on which the total user pain score is calculated.
 Following is the definition of various frequency and severity levels:
 1. `freq(score): *` – How often does this issue come up? How many developers does this affect?
    * low (1) - obscure issue affecting a handful of developers
    * moderate (2) - impacts auxiliary usage patterns, only small number of applications are affected
    * high (3) - impacts primary usage patterns, affecting most Angular apps
    * critical (4) - impacts all Angular apps
 1. `severity(score): *` - How bad is the issue?
    * inconvenience (1) - causes ugly/boilerplate code in apps
    * confusing (2) - unexpected or inconsistent behavior; hard-to-debug
    * broken expected use (3) - it's hard or impossible for a developer using Angular to accomplish something that Angular should be able to do
    * memory leak (4)
    * regression (5) - functionality that used to work no longer works in a new release due to an unintentional change
    * security issue (6)
 These criteria are then used to calculate a "user pain" score as follows:
 `pain = severity × frequency`
 ### Assigning Issues to Milestones
 Any issue that is being worked on must have:
-* An `Assignee`: The person doing the work.
+* An `assignee`: The person doing the work.
 * A `Milestone`: When we expect to complete this work.
 We aim to only have at most three milestones open at a time:
--- a/browser-providers.conf.js
+++ b/browser-providers.conf.js
@ -1,98 +1,242 @@
-/**
+// 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
+// If a category becomes empty (e.g. BS and required), then the corresponding job must be commented out in Travis configuration.
 // out in Travis configuration.
 var CIconfiguration = {
-  'Chrome': {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}},
+  '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}},
+  'ChromeBeta':   { unitTest: {target: null, required: true}, e2e: {target: null, required: false}},
-  'FirefoxBeta': {unitTest: {target: null, required: false}, 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}},
+  'ChromeDev':    { unitTest: {target: null, required: true}, e2e: {target: null, required: true}},
-  'FirefoxDev': {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}},
+  'IE9':          { unitTest: {target: 'SL', required: false}, e2e: {target: null, required: true}},
-  'IE10': {unitTest: {target: 'SL', required: true}, 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}},
+  'IE11':         { unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}},
-  'Edge': {unitTest: {target: 'BS', required: false}, 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.1':   { unitTest: {target: 'SL', required: false}, e2e: {target: null, required: true}},
-  'Android4.2': {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.3':   { unitTest: {target: 'SL', required: false}, e2e: {target: null, required: true}},
-  'Android4.4': {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}},
+  'Android5':     { unitTest: {target: 'SL', required: false}, e2e: {target: null, required: true}},
-  'Safari7': {unitTest: {target: 'BS', 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}},
+  'Safari8':      { unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}},
-  'Safari9': {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}},
+  'Safari10':     { unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}},
-  'iOS7': {unitTest: {target: 'BS', required: true}, 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}},
+  'iOS8':         { unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}},
-  'iOS9': {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}},
+  'iOS10':        { unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}},
-  'WindowsPhone': {unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}}
+  'WindowsPhone': { unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}}
 };
 var customLaunchers = {
-  'DartiumWithWebPlatform':
+  'DartiumWithWebPlatform': {
-      {base: 'Dartium', flags: ['--enable-experimental-web-platform-features']},
+    base: 'Dartium',
-  'ChromeNoSandbox': {base: 'Chrome', flags: ['--no-sandbox']},
+    flags: ['--enable-experimental-web-platform-features'] },
-  'SL_CHROME': {base: 'SauceLabs', browserName: 'chrome', version: '52'},
+  'ChromeNoSandbox': {
-  'SL_CHROMEBETA': {base: 'SauceLabs', browserName: 'chrome', version: 'beta'},
+    base: 'Chrome',
-  'SL_CHROMEDEV': {base: 'SauceLabs', browserName: 'chrome', version: 'dev'},
+    flags: ['--no-sandbox'] },
-  'SL_FIREFOX': {base: 'SauceLabs', browserName: 'firefox', version: '46'},
+  'SL_CHROME': {
-  'SL_FIREFOXBETA': {base: 'SauceLabs', browserName: 'firefox', version: 'beta'},
+    base: 'SauceLabs',
-  'SL_FIREFOXDEV': {base: 'SauceLabs', browserName: 'firefox', version: 'dev'},
+    browserName: 'chrome',
-  'SL_SAFARI7': {base: 'SauceLabs', browserName: 'safari', platform: 'OS X 10.9', version: '7.0'},
+    version: '52'
-  '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_CHROMEBETA': {
-  'SL_SAFARI10':
+    base: 'SauceLabs',
-      {base: 'SauceLabs', browserName: 'safari', platform: 'OS X 10.12', version: '10.0'},
+    browserName: 'chrome',
-  'SL_IOS7': {base: 'SauceLabs', browserName: 'iphone', platform: 'OS X 10.10', version: '7.1'},
+    version: 'beta'
-  '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_CHROMEDEV': {
-  'SL_IOS10': {base: 'SauceLabs', browserName: 'iphone', platform: 'OS X 10.10', version: '10.0'},
+    base: 'SauceLabs',
-  'SL_IE9':
+    browserName: 'chrome',
-      {base: 'SauceLabs', browserName: 'internet explorer', platform: 'Windows 2008', version: '9'},
+    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':
+  'SL_IE11': {
-      {base: 'SauceLabs', browserName: 'internet explorer', platform: 'Windows 8.1', version: '11'},
+    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.1': {
-  'SL_ANDROID4.2': {base: 'SauceLabs', browserName: 'android', platform: 'Linux', version: '4.2'},
+    base: 'SauceLabs',
-  'SL_ANDROID4.3': {base: 'SauceLabs', browserName: 'android', platform: 'Linux', version: '4.3'},
+    browserName: 'android',
-  'SL_ANDROID4.4': {base: 'SauceLabs', browserName: 'android', platform: 'Linux', version: '4.4'},
+    platform: 'Linux',
-  'SL_ANDROID5': {base: 'SauceLabs', browserName: 'android', platform: 'Linux', version: '5.1'},
+    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_CHROME': {
-  'BS_FIREFOX': {base: 'BrowserStack', browser: 'firefox', os: 'Windows', os_version: '10'},
+    base: 'BrowserStack',
-  'BS_SAFARI7': {base: 'BrowserStack', browser: 'safari', os: 'OS X', os_version: 'Mavericks'},
+    browser: 'chrome',
-  'BS_SAFARI8': {base: 'BrowserStack', browser: 'safari', os: 'OS X', os_version: 'Yosemite'},
+    os: 'OS X',
-  'BS_SAFARI9': {base: 'BrowserStack', browser: 'safari', os: 'OS X', os_version: 'El Capitan'},
+    os_version: 'Yosemite'
-  '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_FIREFOX': {
-  'BS_IOS8': {base: 'BrowserStack', device: 'iPhone 6', os: 'ios', os_version: '8.3'},
+    base: 'BrowserStack',
-  'BS_IOS9': {base: 'BrowserStack', device: 'iPhone 6S', os: 'ios', os_version: '9.1'},
+    browser: 'firefox',
-  'BS_IOS10': {base: 'BrowserStack', device: 'iPhone SE', os: 'ios', os_version: '10.0'},
+    os: 'Windows',
-  'BS_IE9':
+    os_version: '10'
-      {base: 'BrowserStack', browser: 'ie', browser_version: '9.0', os: 'Windows', os_version: '7'},
+  },
  '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',
@ -107,31 +251,54 @@ var customLaunchers = {
    os: 'Windows',
    os_version: '10'
  },
-  'BS_EDGE': {base: 'BrowserStack', browser: 'edge', os: 'Windows', os_version: '10'},
+  'BS_EDGE': {
-  'BS_WINDOWSPHONE':
+    base: 'BrowserStack',
-      {base: 'BrowserStack', device: 'Nokia Lumia 930', os: 'winphone', os_version: '8.1'},
+    browser: 'edge',
-  'BS_ANDROID5': {base: 'BrowserStack', device: 'Google Nexus 5', os: 'android', os_version: '5.0'},
+    os: 'Windows',
-  'BS_ANDROID4.4': {base: 'BrowserStack', device: 'HTC One M8', os: 'android', os_version: '4.4'},
+    os_version: '10'
-  'BS_ANDROID4.3':
+  },
-      {base: 'BrowserStack', device: 'Samsung Galaxy S4', os: 'android', os_version: '4.3'},
+  'BS_WINDOWSPHONE' : {
-  'BS_ANDROID4.2':
+    base: 'BrowserStack',
-      {base: 'BrowserStack', device: 'Google Nexus 4', os: 'android', os_version: '4.2'},
+    device: 'Nokia Lumia 930',
-  'BS_ANDROID4.1':
+    os: 'winphone',
-      {base: 'BrowserStack', device: 'Google Nexus 7', os: 'android', os_version: '4.1'}
+    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) {
+  'ALL': Object.keys(customLaunchers).filter(function(item) {return customLaunchers[item].base == 'SauceLabs';}),
-    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'],
  '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'],
@ -143,16 +310,9 @@ var sauceAliases = {
 };
 var browserstackAliases = {
-  'ALL': Object.keys(customLaunchers).filter(function(item) {
+  'ALL': Object.keys(customLaunchers).filter(function(item) {return customLaunchers[item].base == 'BrowserStack';}),
-    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'],
  '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'],
@ -169,9 +329,11 @@ module.exports = {
 function buildConfiguration(type, target, required) {
  return Object.keys(CIconfiguration)
-      .filter((item) => {
+    .filter((item) => {
-        var conf = CIconfiguration[item][type];
+      var conf = CIconfiguration[item][type];
-        return conf.required === required && conf.target === target;
+      return conf.required === required && conf.target === target;
-      })
+    })
-      .map((item) => target + '_' + item.toUpperCase());
+    .map((item) => {
      return target + '_' + item.toUpperCase();
    });
 }
--- a/build.sh
+++ b/build.sh
@ -14,8 +14,8 @@ PACKAGES=(core
  platform-webworker
  platform-webworker-dynamic
  http
  upgrade
  router
  upgrade
  compiler-cli
  benchpress)
 BUILD_ALL=true
@ -63,11 +63,10 @@ if [[ ${BUILD_ALL} == true ]]; then
  ln -s ../../../../node_modules/zone.js/dist/zone.js .
  ln -s ../../../../node_modules/zone.js/dist/long-stack-trace-zone.js .
  ln -s ../../../../node_modules/systemjs/dist/system.src.js .
-  ln -s ../../../../node_modules/base64-js .
+  ln -s ../../../../node_modules/base64-js/lib/b64.js .
  ln -s ../../../../node_modules/reflect-metadata/Reflect.js .
  ln -s ../../../../node_modules/rxjs .
  ln -s ../../../../node_modules/angular/angular.js .
  ln -s ../../../../node_modules/hammerjs/hammer.js .
  cd -
  echo "====== Copying files needed for benchmarks ====="
@ -79,6 +78,7 @@ if [[ ${BUILD_ALL} == true ]]; then
  ln -s ../../../../node_modules/zone.js/dist/zone.js .
  ln -s ../../../../node_modules/zone.js/dist/long-stack-trace-zone.js .
  ln -s ../../../../node_modules/systemjs/dist/system.src.js .
  ln -s ../../../../node_modules/base64-js/lib/b64.js .
  ln -s ../../../../node_modules/reflect-metadata/Reflect.js .
  ln -s ../../../../node_modules/rxjs .
  ln -s ../../../../node_modules/angular/angular.js .
@ -101,29 +101,14 @@ do
  DESTDIR=${PWD}/dist/packages-dist/${PACKAGE}
  UMD_ES5_PATH=${DESTDIR}/bundles/${PACKAGE}.umd.js
  UMD_TESTING_ES5_PATH=${DESTDIR}/bundles/${PACKAGE}-testing.umd.js
  UMD_STATIC_ES5_PATH=${DESTDIR}/bundles/${PACKAGE}-static.umd.js
  UMD_UPGRADE_ES5_PATH=${DESTDIR}/bundles/${PACKAGE}-upgrade.umd.js
  UMD_ES5_MIN_PATH=${DESTDIR}/bundles/${PACKAGE}.umd.min.js
-  UMD_STATIC_ES5_MIN_PATH=${DESTDIR}/bundles/${PACKAGE}-static.umd.min.js
+  LICENSE_BANNER=${PWD}/modules/@angular/license-banner.txt
  UMD_UPGRADE_ES5_MIN_PATH=${DESTDIR}/bundles/${PACKAGE}-upgrade.umd.min.js
  if [[ ${PACKAGE} != router ]]; then
    LICENSE_BANNER=${PWD}/modules/@angular/license-banner.txt
  fi
  if [[ ${PACKAGE} == router ]]; then
    LICENSE_BANNER=${PWD}/modules/@angular/router-license-banner.txt
  fi
  rm -rf ${DESTDIR}
  echo "======      COMPILING: ${TSC} -p ${SRCDIR}/tsconfig-build.json        ====="
  $TSC -p ${SRCDIR}/tsconfig-build.json
  if [[ -e ${SRCDIR}/tsconfig-upgrade.json ]]; then
    echo "======      COMPILING: ${TSC} -p ${SRCDIR}/tsconfig-upgrade.json        ====="
    $TSC -p ${SRCDIR}/tsconfig-upgrade.json
  fi
  cp ${SRCDIR}/package.json ${DESTDIR}/
  cp ${PWD}/modules/@angular/README.md ${DESTDIR}/
@ -172,34 +157,9 @@ do
        cat ${UMD_TESTING_ES5_PATH} >> ${UMD_TESTING_ES5_PATH}.tmp
        mv ${UMD_TESTING_ES5_PATH}.tmp ${UMD_TESTING_ES5_PATH}
      fi
      if [[ -e rollup-static.config.js ]]; then
        echo "======         Rollup ${PACKAGE} static"
        ../../../node_modules/.bin/rollup -c rollup-static.config.js
        # create dir because it doesn't exist yet, we should move the src code here and remove this line
        mkdir ${DESTDIR}/static
        echo "{\"main\": \"../bundles/${PACKAGE}-static.umd.js\"}" > ${DESTDIR}/static/package.json
        cat ${LICENSE_BANNER} > ${UMD_STATIC_ES5_PATH}.tmp
        cat ${UMD_STATIC_ES5_PATH} >> ${UMD_STATIC_ES5_PATH}.tmp
        mv ${UMD_STATIC_ES5_PATH}.tmp ${UMD_STATIC_ES5_PATH}
        $UGLIFYJS -c --screw-ie8 --comments -o ${UMD_STATIC_ES5_MIN_PATH} ${UMD_STATIC_ES5_PATH}
      fi
      if [[ -e rollup-upgrade.config.js ]]; then
        echo "======         Rollup ${PACKAGE} upgrade"
        ../../../node_modules/.bin/rollup -c rollup-upgrade.config.js
        # create dir because it doesn't exist yet, we should move the src code here and remove this line
        mkdir ${DESTDIR}/upgrade
        echo "{\"main\": \"../bundles/${PACKAGE}-upgrade.umd.js\"}" > ${DESTDIR}/upgrade/package.json
        cat ${LICENSE_BANNER} > ${UMD_UPGRADE_ES5_PATH}.tmp
        cat ${UMD_UPGRADE_ES5_PATH} >> ${UMD_UPGRADE_ES5_PATH}.tmp
        mv ${UMD_UPGRADE_ES5_PATH}.tmp ${UMD_UPGRADE_ES5_PATH}
        $UGLIFYJS -c --screw-ie8 --comments -o ${UMD_UPGRADE_ES5_MIN_PATH} ${UMD_UPGRADE_ES5_PATH}
      fi
    ) 2>&1 | grep -v "as external dependency"
  fi
 done
 echo "====== Building examples: ./modules/@angular/examples/build.sh ====="
 ./modules/@angular/examples/build.sh
--- a/docs/PUBLIC_API.md
+++ b/docs/PUBLIC_API.md
@ -1,40 +0,0 @@
 # Supported Public API Surface of Angular
 Our SemVer, timed-release cycle and deprecation policy currently applies to these npm packages:
 - `@angular/core`
 - `@angular/common`
 - `@angular/platform-browser`
 - `@angular/platform-browser-dynamic`
 - `@angular/platform-server`
 - `@angular/platform-webworker`
 - `@angular/platform-webworker-dynamic`
 - `@angular/upgrade`
 - `@angular/router`
 - `@angular/forms`
 - `@angular/http`
 One intentional omission from this list is `@angular/compiler`, which is currently considered a low level api and is subject to internal changes. These changes will not affect any applications or libraries using the higher-level apis (the command line interface or JIT compilation via `@angular/platform-browser-dynamic`). Only very specific use-cases require direct access to the compiler API (mostly tooling integration for IDEs, linters, etc). If you are working on this kind of integration, please reach out to us first.
 Additionally only the command line usage (not direct use of APIs) of `@angular/compiler-cli` is covered.
 Other projects developed by the Angular team like angular-cli, Angular Material, benchpress, will be covered by these or similar guarantees in the future as they mature.
 Within the supported packages, we provide guarantees for:
 - symbols exported via the main entry point (e.g. `@angular/core`) and testing entry point (e.g. `@angular/core/testing`). This applies to both runtime/JavaScript values and TypeScript types.
 - symbols exported via global namespace `ng` (e.g. `ng.core`)
 - bundles located in the `bundles/` directory of our npm packages (e.g. `@angular/core/bundles/core.umd.js`)
 We explicitly don't consider the following to be our public API surface:
 - any file/import paths within our package except for the `/`, `/testing` and `/bundles/*`
 - constructors of injectable classes (services and directives) - please use DI to obtain instances of these classes
 - any class members or symbols marked as `private` or prefixed with underscore
 - extending any of our classes unless the support for this is specifically documented in the API docs
 - the contents and API surface of the code generated by Angular's compiler (with one notable exception: the existence and name of `NgModuleFactory` instances exported from generated code is guaranteed)
 Our peer dependencies (e.g. typescript, zone.js, or rxjs) are not considered part of our API surface, but they are included in our SemVer policies. We might update the required version of any of these dependencies in minor releases if the update doesn't cause breaking changes for Angular applications. Peer dependency updates that result in non-trivial breaking changes must be deferred to major Angular releases.
--- a/gulpfile.js
+++ b/gulpfile.js
@ -1,11 +1,3 @@
 /**
 * @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
@ -21,14 +13,12 @@ const os = require('os');
 // clang-format entry points
 const srcsToFmt = [
-  'modules/@angular/**/*.{js,ts}',
+  'modules/@angular/**/*.ts',
-  'modules/benchmarks/**/*.{js,ts}',
+  'modules/benchmarks/**/*.ts',
-  'modules/e2e_util/**/*.{js,ts}',
+  'modules/e2e_util/**/*.ts',
-  'modules/playground/**/*.{js,ts}',
+  'modules/playground/**/*.ts',
-  'tools/**/*.{js,ts}',
+  'tools/**/*.ts',
  '!tools/public_api_guard/**/*.d.ts',
  './*.{js,ts}',
  '!shims_for_IE.js',
 ];
 // Check source code for formatting errors (clang-format)
@ -36,16 +26,15 @@ 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: '.'})
+  return gulp.src(srcsToFmt, { base: '.' }).pipe(
-      .pipe(format.format('file', clangFormat))
+    format.format('file', clangFormat)).pipe(gulp.dest('.'));
      .pipe(gulp.dest('.'));
 });
 const entrypoints = [
@ -58,7 +47,6 @@ const entrypoints = [
  //'dist/packages-dist/compiler/index.d.ts',
  //'dist/packages-dist/compiler/testing.d.ts',
  'dist/packages-dist/upgrade/index.d.ts',
  'dist/packages-dist/upgrade/static.d.ts',
  'dist/packages-dist/platform-browser/index.d.ts',
  'dist/packages-dist/platform-browser/testing/index.d.ts',
  'dist/packages-dist/platform-browser-dynamic/index.d.ts',
@ -74,18 +62,12 @@ const entrypoints = [
 ];
 const publicApiDir = path.normalize('tools/public_api_guard');
 const publicApiArgs = [
-  '--rootDir',
+  '--rootDir', 'dist/packages-dist',
-  'dist/packages-dist',
+  '--stripExportPattern', '^__',
-  '--stripExportPattern',
+  '--allowModuleIdentifiers', 'jasmine',
-  '^__',
+  '--allowModuleIdentifiers', 'protractor',
-  '--allowModuleIdentifiers',
+  '--allowModuleIdentifiers', 'angular',
-  'jasmine',
+  '--onStabilityMissing', 'error',
  '--allowModuleIdentifiers',
  'protractor',
  '--allowModuleIdentifiers',
  'angular',
  '--onStabilityMissing',
  'error',
 ].concat(entrypoints);
 // Build angular
@ -101,17 +83,17 @@ gulp.task('public-api:enforce', (done) => {
  const childProcess = require('child_process');
  childProcess
-      .spawn(
+    .spawn(
-          path.join(__dirname, platformScriptPath(`/node_modules/.bin/ts-api-guardian`)),
+      path.join(__dirname, platformScriptPath(`/node_modules/.bin/ts-api-guardian`)),
-          ['--verifyDir', publicApiDir].concat(publicApiArgs), {stdio: 'inherit'})
+      ['--verifyDir', publicApiDir].concat(publicApiArgs), {stdio: 'inherit'})
-      .on('close', (errorCode) => {
+    .on('close', (errorCode) => {
-        if (errorCode !== 0) {
+      if (errorCode !== 0) {
-          done(new Error(
+        done(new Error(
-              'Public API differs from golden file. Please run `gulp public-api:update`.'));
+          'Public API differs from golden file. Please run `gulp public-api:update`.'));
-        } else {
+      } else {
-          done();
+        done();
-        }
+      }
-      });
+    });
 });
 // Generate the public API golden files
@ -119,40 +101,36 @@ gulp.task('public-api:update', ['build.sh'], (done) => {
  const childProcess = require('child_process');
  childProcess
-      .spawn(
+    .spawn(
-          path.join(__dirname, platformScriptPath(`/node_modules/.bin/ts-api-guardian`)),
+      path.join(__dirname, platformScriptPath(`/node_modules/.bin/ts-api-guardian`)),
-          ['--outDir', publicApiDir].concat(publicApiArgs), {stdio: 'inherit'})
+      ['--outDir', publicApiDir].concat(publicApiArgs), {stdio: 'inherit'})
-      .on('close', done);
+    .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.
 gulp.task('check-tests', function() {
  const ddescribeIit = require('gulp-ddescribe-iit');
  return gulp.src([
    'modules/**/*.spec.ts',
    'modules/**/*_spec.ts',
  ]).pipe(ddescribeIit({allowDisabledTests: true}));
 });
 // Check the coding standards and programming errors
-gulp.task('lint', ['format:enforce', 'tools:build'], () => {
+gulp.task('lint', ['check-tests', 'format:enforce', 'tools:build'], () => {
  const tslint = require('gulp-tslint');
  // Built-in rules are at
-  // https://palantir.github.io/tslint/rules/
+  // https://github.com/palantir/tslint#supported-rules
  const tslintConfig = require('./tslint.json');
-  return gulp
+  return gulp.src(['modules/@angular/**/*.ts', 'modules/benchpress/**/*.ts'])
-      .src([
+    .pipe(tslint({
-        // todo(vicb): add .js files when supported
+      tslint: require('tslint').default,
-        // see https://github.com/palantir/tslint/pull/1515
+      configuration: tslintConfig,
-        './modules/**/*.ts',
+      rulesDirectory: 'dist/tools/tslint',
-        './tools/**/*.ts',
+      formatter: 'prose',
-        './*.ts',
+    }))
-
+    .pipe(tslint.report({emitError: true}));
        // Ignore TypeScript mocks because it's not managed by us
        '!./tools/@angular/tsc-wrapped/test/typescript.mocks.ts',
        // Ignore generated files due to lack of copyright header
        // todo(alfaproject): make generated files lintable
        '!**/*.d.ts',
        '!**/*.ngfactory.ts',
      ])
      .pipe(tslint({
        tslint: require('tslint').default,
        configuration: tslintConfig,
        formatter: 'prose',
      }))
      .pipe(tslint.report({emitError: true}));
 });
 gulp.task('tools:build', (done) => { tsc('tools/', done); });
@ -164,7 +142,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) {
@ -195,11 +173,11 @@ gulp.task('serve-examples', () => {
  const cors = require('cors');
  connect.server({
-    root: `${__dirname}/dist/examples`,
+      root: `${__dirname}/dist/examples`,
-    port: 8001,
+      port: 8001,
-    livereload: false,
+      livereload: false,
-    open: false,
+      open: false,
-    middleware: (connect, opt) => [cors()],
+      middleware: (connect, opt) => [cors()],
  });
 });
@ -209,13 +187,16 @@ gulp.task('changelog', () => {
  const conventionalChangelog = require('gulp-conventional-changelog');
  return gulp.src('CHANGELOG.md')
-      .pipe(conventionalChangelog({preset: 'angular', releaseCount: 1}, {
+    .pipe(conventionalChangelog({
-        // Conventional Changelog Context
+      preset: 'angular',
-        // We have to manually set version number so it doesn't get prefixed with `v`
+      releaseCount: 1
-        // See https://github.com/conventional-changelog/conventional-changelog-core/issues/10
+    }, {
-        currentTag: require('./package.json').version
+      // Conventional Changelog Context
-      }))
+      // We have to manually set version number so it doesn't get prefixed with `v`
-      .pipe(gulp.dest('./'));
+      // See https://github.com/conventional-changelog/conventional-changelog-core/issues/10
      currentTag: require('./package.json').version
    }))
    .pipe(gulp.dest('./'));
 });
 function tsc(projectPath, done) {
@ -224,7 +205,8 @@ 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);
 }
--- a/karma-js.conf.js
+++ b/karma-js.conf.js
@ -1,11 +1,3 @@
 /**
 * @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');
@ -23,27 +15,26 @@ module.exports = function(config) {
      'node_modules/core-js/client/core.js',
      // include Angular v1 for upgrade module testing
-      'node_modules/angular/angular.js',
+      '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/zone.js',
-      'node_modules/zone.js/dist/proxy.js', 'node_modules/zone.js/dist/sync-test.js',
+      'node_modules/zone.js/dist/long-stack-trace-zone.js',
-      'node_modules/zone.js/dist/jasmine-patch.js', 'node_modules/zone.js/dist/async-test.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',
+      'node_modules/reflect-metadata/Reflect.js',
-      {pattern: 'dist/all/empty.*', included: false, watched: false}, {
+      'tools/build/file2modulename.js',
-        pattern: 'modules/@angular/platform-browser/test/static_assets/**',
+      'test-main.js',
-        included: false,
+      {pattern: 'dist/all/empty.*', included: false, watched: 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}
      {
        pattern: 'modules/@angular/platform-browser/test/browser/static_assets/**',
        included: false,
        watched: false,
      }
    ],
    exclude: [
@ -53,7 +44,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,
@ -64,11 +55,11 @@ module.exports = function(config) {
      'karma-sauce-launcher',
      'karma-chrome-launcher',
      'karma-sourcemap-loader',
-      internalAngularReporter,
+      internalAngularReporter
    ],
    preprocessors: {
-      '**/*.js': ['sourcemap'],
+      '**/*.js': ['sourcemap']
    },
    reporters: ['internal-angular'],
@ -82,7 +73,7 @@ module.exports = function(config) {
        'selenium-version': '2.53.0',
        'command-timeout': 600,
        'idle-timeout': 600,
-        'max-duration': 5400,
+        'max-duration': 5400
      }
    },
@ -90,22 +81,21 @@ module.exports = function(config) {
      project: 'Angular2',
      startTunnel: false,
      retryLimit: 3,
-      timeout: 1800,
+      timeout: 600,
-      pollingTimeout: 10000,
+      pollingTimeout: 10000
    },
    browsers: ['Chrome'],
    port: 9876,
-    captureTimeout: 180000,
+    captureTimeout: 60000,
-    browserDisconnectTimeout: 180000,
+    browserDisconnectTimeout : 60000,
-    browserDisconnectTolerance: 3,
+    browserDisconnectTolerance : 3,
-    browserNoActivityTimeout: 300000,
+    browserNoActivityTimeout : 60000,
  });
  if (process.env.TRAVIS) {
-    var buildId =
+    var buildId = 'TRAVIS #' + process.env.TRAVIS_BUILD_NUMBER + ' (' + process.env.TRAVIS_BUILD_ID + ')';
        '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;
--- a/modules/@angular/benchpress/README.md
+++ b/modules/@angular/benchpress/README.md
@ -5,7 +5,7 @@ See [here for an example project](https://github.com/angular/benchpress-tree).
 The sources for this package are in the main [Angular2](https://github.com/angular/angular) repo. Please file issues and pull requests against that repo.
-License: MIT
+License: Apache MIT 2.0
 # Why?
--- a/modules/@angular/benchpress/src/common_options.ts
+++ b/modules/@angular/benchpress/src/common_options.ts
@ -9,6 +9,8 @@
 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');
@ -32,7 +34,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: () => new Date()},
+    {provide: Options.NOW, useValue: () => DateWrapper.now()},
    {provide: Options.RECEIVED_DATA, useValue: false},
    {provide: Options.REQUEST_COUNT, useValue: false},
    {provide: Options.CAPTURE_FRAMES, useValue: false},
--- a/modules/@angular/benchpress/src/firefox_extension/data/installed_script.ts
+++ b/modules/@angular/benchpress/src/firefox_extension/data/installed_script.ts
@ -10,7 +10,7 @@ declare var exportFunction: any;
 declare var unsafeWindow: any;
 exportFunction(function() {
-  const curTime = unsafeWindow.performance.now();
+  var curTime = unsafeWindow.performance.now();
  (<any>self).port.emit('startProfiler', curTime);
 }, unsafeWindow, {defineAs: 'startProfiler'});
@ -28,11 +28,11 @@ exportFunction(function() {
 }, unsafeWindow, {defineAs: 'forceGC'});
 exportFunction(function(name: string) {
-  const curTime = unsafeWindow.performance.now();
+  var curTime = unsafeWindow.performance.now();
  (<any>self).port.emit('markStart', name, curTime);
 }, unsafeWindow, {defineAs: 'markStart'});
 exportFunction(function(name: string) {
-  const curTime = unsafeWindow.performance.now();
+  var curTime = unsafeWindow.performance.now();
  (<any>self).port.emit('markEnd', name, curTime);
 }, unsafeWindow, {defineAs: 'markEnd'});
--- a/modules/@angular/benchpress/src/firefox_extension/lib/main.ts
+++ b/modules/@angular/benchpress/src/firefox_extension/lib/main.ts
@ -6,9 +6,9 @@
 * found in the LICENSE file at https://angular.io/license
 */
-const {Cc, Ci, Cu} = require('chrome');
+var {Cc, Ci, Cu} = require('chrome');
-const os = Cc['@mozilla.org/observer-service;1'].getService(Ci.nsIObserverService);
+var os = Cc['@mozilla.org/observer-service;1'].getService(Ci.nsIObserverService);
-const ParserUtil = require('./parser_util');
+var ParserUtil = require('./parser_util');
 class Profiler {
  private _profiler: any;
@ -26,8 +26,8 @@ class Profiler {
  stop() { this._profiler.StopProfiler(); }
  getProfilePerfEvents() {
-    const profileData = this._profiler.getProfileData();
+    var profileData = this._profiler.getProfileData();
-    let perfEvents = ParserUtil.convertPerfProfileToEvents(profileData);
+    var perfEvents = ParserUtil.convertPerfProfileToEvents(profileData);
    perfEvents = this._mergeMarkerEvents(perfEvents);
    perfEvents.sort(function(event1: any, event2: any) {
      return event1.ts - event2.ts;
@ -55,9 +55,9 @@ function forceGC() {
  os.notifyObservers(null, 'child-gc-request', null);
 };
-const mod = require('sdk/page-mod');
+var mod = require('sdk/page-mod');
-const data = require('sdk/self').data;
+var data = require('sdk/self').data;
-const profiler = new Profiler();
+var profiler = new Profiler();
 mod.PageMod({
  include: ['*'],
  contentScriptFile: data.url('installed_script.js'),
--- a/modules/@angular/benchpress/src/firefox_extension/lib/parser_util.ts
+++ b/modules/@angular/benchpress/src/firefox_extension/lib/parser_util.ts
@ -12,11 +12,11 @@
 *     within the perf profile.
 */
 export function convertPerfProfileToEvents(perfProfile: any): any[] {
-  const inProgressEvents = new Map();                 // map from event name to start time
+  var inProgressEvents = new Map();                 // map from event name to start time
-  const finishedEvents: {[key: string]: any}[] = [];  // Event[] finished events
+  var finishedEvents: {[key: string]: any}[] = [];  // Event[] finished events
-  const addFinishedEvent = function(eventName: string, startTime: number, endTime: number) {
+  var addFinishedEvent = function(eventName: string, startTime: number, endTime: number) {
-    const categorizedEventName = categorizeEvent(eventName);
+    var categorizedEventName = categorizeEvent(eventName);
-    let args: {[key: string]: any} = undefined;
+    var args: {[key: string]: any} = undefined;
    if (categorizedEventName == 'gc') {
      // TODO: We cannot measure heap size at the moment
      args = {usedHeapSize: 0};
@ -31,17 +31,17 @@ export function convertPerfProfileToEvents(perfProfile: any): any[] {
    }
  };
-  const samples = perfProfile.threads[0].samples;
+  var samples = perfProfile.threads[0].samples;
  // In perf profile, firefox samples all the frames in set time intervals. Here
  // we go through all the samples and construct the start and end time for each
  // event.
-  for (let i = 0; i < samples.length; ++i) {
+  for (var i = 0; i < samples.length; ++i) {
-    const sample = samples[i];
+    var sample = samples[i];
-    const sampleTime = sample.time;
+    var sampleTime = sample.time;
    // Add all the frames into a set so it's easier/faster to find the set
    // differences
-    const sampleFrames = new Set();
+    var sampleFrames = new Set();
    sample.frames.forEach(function(frame: {[key: string]: any}) {
      sampleFrames.add(frame['location']);
    });
@ -49,7 +49,7 @@ export function convertPerfProfileToEvents(perfProfile: any): any[] {
    // If an event is in the inProgressEvents map, but not in the current sample,
    // then it must have just finished. We add this event to the finishedEvents
    // array and remove it from the inProgressEvents map.
-    const previousSampleTime = (i == 0 ? /* not used */ -1 : samples[i - 1].time);
+    var previousSampleTime = (i == 0 ? /* not used */ -1 : samples[i - 1].time);
    inProgressEvents.forEach(function(startTime, eventName) {
      if (!(sampleFrames.has(eventName))) {
        addFinishedEvent(eventName, startTime, previousSampleTime);
@ -69,7 +69,7 @@ export function convertPerfProfileToEvents(perfProfile: any): any[] {
  // If anything is still in progress, we need to included it as a finished event
  // since recording ended.
-  const lastSampleTime = samples[samples.length - 1].time;
+  var lastSampleTime = samples[samples.length - 1].time;
  inProgressEvents.forEach(function(startTime, eventName) {
    addFinishedEvent(eventName, startTime, lastSampleTime);
  });
--- a/modules/@angular/benchpress/src/firefox_extension/lib/test_helper.ts
+++ b/modules/@angular/benchpress/src/firefox_extension/lib/test_helper.ts
@ -6,15 +6,15 @@
 * found in the LICENSE file at https://angular.io/license
 */
-const q = require('q');
+var q = require('q');
-const FirefoxProfile = require('firefox-profile');
+var FirefoxProfile = require('firefox-profile');
-const jpm = require('jpm/lib/xpi');
+var jpm = require('jpm/lib/xpi');
-const pathUtil = require('path');
+var pathUtil = require('path');
-const PERF_ADDON_PACKAGE_JSON_DIR = '..';
+var PERF_ADDON_PACKAGE_JSON_DIR = '..';
 exports.getAbsolutePath = function(path: string) {
-  const normalizedPath = pathUtil.normalize(path);
+  var normalizedPath = pathUtil.normalize(path);
  if (pathUtil.resolve(normalizedPath) == normalizedPath) {
    // Already absolute path
    return normalizedPath;
@ -24,12 +24,12 @@ exports.getAbsolutePath = function(path: string) {
 };
 exports.getFirefoxProfile = function(extensionPath: string) {
-  const deferred = q.defer();
+  var deferred = q.defer();
-  const firefoxProfile = new FirefoxProfile();
+  var firefoxProfile = new FirefoxProfile();
  firefoxProfile.addExtensions([extensionPath], () => {
    firefoxProfile.encoded((encodedProfile: any) => {
-      const multiCapabilities = [{browserName: 'firefox', firefox_profile: encodedProfile}];
+      var multiCapabilities = [{browserName: 'firefox', firefox_profile: encodedProfile}];
      deferred.resolve(multiCapabilities);
    });
  });
@ -38,10 +38,10 @@ exports.getFirefoxProfile = function(extensionPath: string) {
 };
 exports.getFirefoxProfileWithExtension = function() {
-  const absPackageJsonDir = pathUtil.join(__dirname, PERF_ADDON_PACKAGE_JSON_DIR);
+  var absPackageJsonDir = pathUtil.join(__dirname, PERF_ADDON_PACKAGE_JSON_DIR);
-  const packageJson = require(pathUtil.join(absPackageJsonDir, 'package.json'));
+  var packageJson = require(pathUtil.join(absPackageJsonDir, 'package.json'));
-  const savedCwd = process.cwd();
+  var savedCwd = process.cwd();
  process.chdir(absPackageJsonDir);
  return jpm(packageJson).then((xpiPath: string) => {
--- a/modules/@angular/benchpress/src/metric/multi_metric.ts
+++ b/modules/@angular/benchpress/src/metric/multi_metric.ts
@ -7,6 +7,7 @@
 */
 import {Injector, OpaqueToken} from '@angular/core';
 import {StringMapWrapper} from '../facade/collection';
 import {Metric} from '../metric';
@ -55,9 +56,10 @@ export class MultiMetric extends Metric {
 }
 function mergeStringMaps(maps: {[key: string]: string}[]): {[key: string]: string} {
-  const result: {[key: string]: string} = {};
+  var result: {[key: string]: string} = {};
-  maps.forEach(map => { Object.keys(map).forEach(prop => { result[prop] = map[prop]; }); });
+  maps.forEach(
      map => { StringMapWrapper.forEach(map, (value, prop) => { result[prop] = value; }); });
  return result;
 }
-const _CHILDREN = new OpaqueToken('MultiMetric.children');
+var _CHILDREN = new OpaqueToken('MultiMetric.children');
--- a/modules/@angular/benchpress/src/metric/perflog_metric.ts
+++ b/modules/@angular/benchpress/src/metric/perflog_metric.ts
@ -56,7 +56,7 @@ export class PerflogMetric extends Metric {
  }
  describe(): {[key: string]: string} {
-    const res: {[key: string]: any} = {
+    var res: {[key: string]: any} = {
      'scriptTime': 'script execution time in ms, including gc and render',
      'pureScriptTime': 'script execution time in ms, without gc nor render'
    };
@ -80,7 +80,7 @@ export class PerflogMetric extends Metric {
    }
    if (this._captureFrames) {
      if (!this._perfLogFeatures.frameCapture) {
-        const warningMsg = 'WARNING: Metric requested, but not supported by driver';
+        var warningMsg = 'WARNING: Metric requested, but not supported by driver';
        // using dot syntax for metric name to keep them grouped together in console reporter
        res['frameTime.mean'] = warningMsg;
        res['frameTime.worst'] = warningMsg;
@ -93,14 +93,14 @@ export class PerflogMetric extends Metric {
        res['frameTime.smooth'] = 'percentage of frames that hit 60fps';
      }
    }
-    for (const name in this._microMetrics) {
+    for (let name in this._microMetrics) {
      res[name] = this._microMetrics[name];
    }
    return res;
  }
  beginMeasure(): Promise<any> {
-    let resultPromise = Promise.resolve(null);
+    var resultPromise = Promise.resolve(null);
    if (this._forceGc) {
      resultPromise = resultPromise.then((_) => this._driverExtension.gc());
    }
@ -119,7 +119,7 @@ export class PerflogMetric extends Metric {
  private _endPlainMeasureAndMeasureForceGc(restartMeasure: boolean) {
    return this._endMeasure(true).then((measureValues) => {
      // disable frame capture for measurements during forced gc
-      const originalFrameCaptureValue = this._captureFrames;
+      var originalFrameCaptureValue = this._captureFrames;
      this._captureFrames = false;
      return this._driverExtension.gc()
          .then((_) => this._endMeasure(restartMeasure))
@ -137,8 +137,8 @@ export class PerflogMetric extends Metric {
  }
  private _endMeasure(restart: boolean): Promise<{[key: string]: number}> {
-    const markName = this._markName(this._measureCount - 1);
+    var markName = this._markName(this._measureCount - 1);
-    const nextMarkName = restart ? this._markName(this._measureCount++) : null;
+    var nextMarkName = restart ? this._markName(this._measureCount++) : null;
    return this._driverExtension.timeEnd(markName, nextMarkName)
        .then((_) => this._readUntilEndMark(markName));
  }
@ -150,26 +150,26 @@ export class PerflogMetric extends Metric {
    }
    return this._driverExtension.readPerfLog().then((events) => {
      this._addEvents(events);
-      const result = this._aggregateEvents(this._remainingEvents, markName);
+      var result = this._aggregateEvents(this._remainingEvents, markName);
      if (result) {
        this._remainingEvents = events;
        return result;
      }
-      let resolve: (result: any) => void;
+      var resolve: (result: any) => void;
-      const promise = new Promise(res => { resolve = res; });
+      var promise = new Promise(res => { resolve = res; });
      this._setTimeout(() => resolve(this._readUntilEndMark(markName, loopCount + 1)), 100);
      return promise;
    });
  }
  private _addEvents(events: PerfLogEvent[]) {
-    let needSort = false;
+    var needSort = false;
    events.forEach(event => {
      if (event['ph'] === 'X') {
        needSort = true;
-        const startEvent: PerfLogEvent = {};
+        var startEvent: PerfLogEvent = {};
-        const endEvent: PerfLogEvent = {};
+        var endEvent: PerfLogEvent = {};
-        for (const prop in event) {
+        for (let prop in event) {
          startEvent[prop] = event[prop];
          endEvent[prop] = event[prop];
        }
@ -185,14 +185,14 @@ export class PerflogMetric extends Metric {
    if (needSort) {
      // Need to sort because of the ph==='X' events
      this._remainingEvents.sort((a, b) => {
-        const diff = a['ts'] - b['ts'];
+        var diff = a['ts'] - b['ts'];
        return diff > 0 ? 1 : diff < 0 ? -1 : 0;
      });
    }
  }
  private _aggregateEvents(events: PerfLogEvent[], markName: string): {[key: string]: number} {
-    const result: {[key: string]: number} = {'scriptTime': 0, 'pureScriptTime': 0};
+    var result: {[key: string]: number} = {'scriptTime': 0, 'pureScriptTime': 0};
    if (this._perfLogFeatures.gc) {
      result['gcTime'] = 0;
      result['majorGcTime'] = 0;
@ -207,7 +207,7 @@ export class PerflogMetric extends Metric {
      result['frameTime.worst'] = 0;
      result['frameTime.smooth'] = 0;
    }
-    for (const name in this._microMetrics) {
+    for (let name in this._microMetrics) {
      result[name] = 0;
    }
    if (this._receivedData) {
@ -217,11 +217,11 @@ export class PerflogMetric extends Metric {
      result['requestCount'] = 0;
    }
-    let markStartEvent: PerfLogEvent = null;
+    var markStartEvent: PerfLogEvent = null;
-    let markEndEvent: PerfLogEvent = null;
+    var markEndEvent: PerfLogEvent = null;
    events.forEach((event) => {
-      const ph = event['ph'];
+      var ph = event['ph'];
-      const name = event['name'];
+      var name = event['name'];
      if (ph === 'B' && name === markName) {
        markStartEvent = event;
      } else if (ph === 'I' && name === 'navigationStart') {
@ -237,23 +237,23 @@ export class PerflogMetric extends Metric {
      return null;
    }
-    let gcTimeInScript = 0;
+    var gcTimeInScript = 0;
-    let renderTimeInScript = 0;
+    var renderTimeInScript = 0;
-    const frameTimestamps: number[] = [];
+    var frameTimestamps: number[] = [];
-    const frameTimes: number[] = [];
+    var frameTimes: number[] = [];
-    let frameCaptureStartEvent: PerfLogEvent = null;
+    var frameCaptureStartEvent: PerfLogEvent = null;
-    let frameCaptureEndEvent: PerfLogEvent = null;
+    var frameCaptureEndEvent: PerfLogEvent = null;
-    const intervalStarts: {[key: string]: PerfLogEvent} = {};
+    var intervalStarts: {[key: string]: PerfLogEvent} = {};
-    const intervalStartCount: {[key: string]: number} = {};
+    var intervalStartCount: {[key: string]: number} = {};
-    let inMeasureRange = false;
+    var inMeasureRange = false;
    events.forEach((event) => {
-      const ph = event['ph'];
+      var ph = event['ph'];
-      let name = event['name'];
+      var name = event['name'];
-      let microIterations = 1;
+      var microIterations = 1;
-      const microIterationsMatch = name.match(_MICRO_ITERATIONS_REGEX);
+      var microIterationsMatch = name.match(_MICRO_ITERATIONS_REGEX);
      if (microIterationsMatch) {
        name = microIterationsMatch[1];
        microIterations = parseInt(microIterationsMatch[2], 10);
@ -307,15 +307,15 @@ export class PerflogMetric extends Metric {
      } else if ((ph === 'E') && intervalStarts[name]) {
        intervalStartCount[name]--;
        if (intervalStartCount[name] === 0) {
-          const startEvent = intervalStarts[name];
+          var startEvent = intervalStarts[name];
-          const duration = (event['ts'] - startEvent['ts']);
+          var duration = (event['ts'] - startEvent['ts']);
          intervalStarts[name] = null;
          if (name === 'gc') {
            result['gcTime'] += duration;
-            const amount =
+            var amount =
                (startEvent['args']['usedHeapSize'] - event['args']['usedHeapSize']) / 1000;
            result['gcAmount'] += amount;
-            const majorGc = event['args']['majorGc'];
+            var majorGc = event['args']['majorGc'];
            if (majorGc && majorGc) {
              result['majorGcTime'] += duration;
            }
@ -351,7 +351,7 @@ export class PerflogMetric extends Metric {
  private _addFrameMetrics(result: {[key: string]: number}, frameTimes: any[]) {
    result['frameTime.mean'] = frameTimes.reduce((a, b) => a + b, 0) / frameTimes.length;
-    const firstFrame = frameTimes[0];
+    var firstFrame = frameTimes[0];
    result['frameTime.worst'] = frameTimes.reduce((a, b) => a > b ? a : b, firstFrame);
    result['frameTime.best'] = frameTimes.reduce((a, b) => a < b ? a : b, firstFrame);
    result['frameTime.smooth'] =
@ -361,11 +361,11 @@ export class PerflogMetric extends Metric {
  private _markName(index: number) { return `${_MARK_NAME_PREFIX}${index}`; }
 }
-const _MICRO_ITERATIONS_REGEX = /(.+)\*(\d+)$/;
+var _MICRO_ITERATIONS_REGEX = /(.+)\*(\d+)$/;
-const _MAX_RETRY_COUNT = 20;
+var _MAX_RETRY_COUNT = 20;
-const _MARK_NAME_PREFIX = 'benchpress';
+var _MARK_NAME_PREFIX = 'benchpress';
-const _MARK_NAME_FRAME_CAPUTRE = 'frameCapture';
+var _MARK_NAME_FRAME_CAPUTRE = 'frameCapture';
 // using 17ms as a somewhat looser threshold, instead of 16.6666ms
-const _FRAME_TIME_SMOOTH_THRESHOLD = 17;
+var _FRAME_TIME_SMOOTH_THRESHOLD = 17;
--- a/modules/@angular/benchpress/src/metric/user_metric.ts
+++ b/modules/@angular/benchpress/src/metric/user_metric.ts
@ -9,6 +9,8 @@
 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';
@ -33,20 +35,20 @@ export class UserMetric extends Metric {
  endMeasure(restart: boolean): Promise<{[key: string]: any}> {
    let resolve: (result: any) => void;
    let reject: (error: any) => void;
-    const promise = new Promise((res, rej) => {
+    let promise = new Promise((res, rej) => {
      resolve = res;
      reject = rej;
    });
-    const adapter = this._wdAdapter;
+    let adapter = this._wdAdapter;
-    const names = Object.keys(this._userMetrics);
+    let names = StringMapWrapper.keys(this._userMetrics);
    function getAndClearValues() {
      Promise.all(names.map(name => adapter.executeScript(`return window.${name}`)))
          .then((values: any[]) => {
-            if (values.every(v => typeof v === 'number')) {
+            if (values.every(isNumber)) {
              Promise.all(names.map(name => adapter.executeScript(`delete window.${name}`)))
                  .then((_: any[]) => {
-                    const map: {[k: string]: any} = {};
+                    let map: {[k: string]: any} = {};
                    for (let i = 0, n = names.length; i < n; i++) {
                      map[names[i]] = values[i];
                    }
--- a/modules/@angular/benchpress/src/reporter/console_reporter.ts
+++ b/modules/@angular/benchpress/src/reporter/console_reporter.ts
@ -7,7 +7,10 @@
 */
 import {Inject, Injectable, OpaqueToken} from '@angular/core';
-import {print} from '../facade/lang';
+
 import {ListWrapper, StringMapWrapper} from '../facade/collection';
 import {NumberWrapper, isBlank, isPresent, print} from '../facade/lang';
 import {Math} from '../facade/math';
 import {MeasureValues} from '../measure_values';
 import {Reporter} from '../reporter';
 import {SampleDescription} from '../sample_description';
@ -28,8 +31,8 @@ export class ConsoleReporter extends Reporter {
  ];
  private static _lpad(value: string, columnWidth: number, fill = ' ') {
-    let result = '';
+    var result = '';
-    for (let i = 0; i < columnWidth - value.length; i++) {
+    for (var i = 0; i < columnWidth - value.length; i++) {
      result += fill;
    }
    return result + value;
@ -49,7 +52,7 @@ export class ConsoleReporter extends Reporter {
  private _printDescription(sampleDescription: SampleDescription) {
    this._print(`BENCHMARK ${sampleDescription.id}`);
    this._print('Description:');
-    const props = sortedProps(sampleDescription.description);
+    var props = sortedProps(sampleDescription.description);
    props.forEach((prop) => { this._print(`- ${prop}: ${sampleDescription.description[prop]}`); });
    this._print('Metrics:');
    this._metricNames.forEach((metricName) => {
@ -61,8 +64,8 @@ export class ConsoleReporter extends Reporter {
  }
  reportMeasureValues(measureValues: MeasureValues): Promise<any> {
-    const formattedValues = this._metricNames.map(metricName => {
+    var formattedValues = this._metricNames.map(metricName => {
-      const value = measureValues.values[metricName];
+      var value = measureValues.values[metricName];
      return formatNum(value);
    });
    this._printStringRow(formattedValues);
--- a/modules/@angular/benchpress/src/reporter/json_file_reporter.ts
+++ b/modules/@angular/benchpress/src/reporter/json_file_reporter.ts
@ -9,6 +9,7 @@
 import {Inject, Injectable, OpaqueToken} from '@angular/core';
 import {Options} from '../common_options';
 import {DateWrapper, Json, isBlank, isPresent} from '../facade/lang';
 import {MeasureValues} from '../measure_values';
 import {Reporter} from '../reporter';
 import {SampleDescription} from '../sample_description';
@ -38,15 +39,14 @@ export class JsonFileReporter extends Reporter {
    sortedProps(this._description.metrics).forEach((metricName) => {
      stats[metricName] = formatStats(validSample, metricName);
    });
-    const content = JSON.stringify(
+    var content = Json.stringify({
-        {
+      'description': this._description,
-          'description': this._description,
+      'stats': stats,
-          'stats': stats,
+      'completeSample': completeSample,
-          'completeSample': completeSample,
+      'validSample': validSample,
-          'validSample': validSample,
+    });
-        },
+    var filePath =
-        null, 2);
+        `${this._path}/${this._description.id}_${DateWrapper.toMillis(this._now())}.json`;
    const filePath = `${this._path}/${this._description.id}_${this._now().getTime()}.json`;
    return this._writeFile(filePath, content);
  }
 }
--- a/modules/@angular/benchpress/src/reporter/multi_reporter.ts
+++ b/modules/@angular/benchpress/src/reporter/multi_reporter.ts
@ -39,4 +39,4 @@ export class MultiReporter extends Reporter {
  }
 }
-const _CHILDREN = new OpaqueToken('MultiReporter.children');
+var _CHILDREN = new OpaqueToken('MultiReporter.children');
--- a/modules/@angular/benchpress/src/reporter/util.ts
+++ b/modules/@angular/benchpress/src/reporter/util.ts
@ -6,23 +6,28 @@
 * 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';
 export function formatNum(n: number) {
-  return n.toFixed(2);
+  return NumberWrapper.toFixed(n, 2);
 }
 export function sortedProps(obj: {[key: string]: any}) {
-  return Object.keys(obj).sort();
+  var props: string[] = [];
  StringMapWrapper.forEach(obj, (value, prop) => props.push(prop));
  props.sort();
  return props;
 }
 export function formatStats(validSamples: MeasureValues[], metricName: string): string {
-  const samples = validSamples.map(measureValues => measureValues.values[metricName]);
+  var samples = validSamples.map(measureValues => measureValues.values[metricName]);
-  const mean = Statistic.calculateMean(samples);
+  var mean = Statistic.calculateMean(samples);
-  const cv = Statistic.calculateCoefficientOfVariation(samples, mean);
+  var cv = Statistic.calculateCoefficientOfVariation(samples, mean);
-  const formattedMean = formatNum(mean);
+  var formattedMean = formatNum(mean);
  // Note: Don't use the unicode character for +- as it might cause
  // hickups for consoles...
-  return isNaN(cv) ? formattedMean : `${formattedMean}+-${Math.floor(cv)}%`;
+  return NumberWrapper.isNaN(cv) ? formattedMean : `${formattedMean}+-${Math.floor(cv)}%`;
-}
+}
--- 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 {isPresent} from './facade/lang';
+import {isBlank, isPresent} from './facade/lang';
 import {Metric} from './metric';
 import {MultiMetric} from './metric/multi_metric';
 import {PerflogMetric} from './metric/perflog_metric';
@ -45,7 +45,7 @@ export class Runner {
    providers?: Provider[],
    userMetrics?: {[key: string]: string}
  }): Promise<SampleState> {
-    const sampleProviders: Provider[] = [
+    var sampleProviders: Provider[] = [
      _DEFAULT_PROVIDERS, this._defaultProviders, {provide: Options.SAMPLE_ID, useValue: id},
      {provide: Options.EXECUTE, useValue: execute}
    ];
@ -62,33 +62,33 @@ export class Runner {
      sampleProviders.push(providers);
    }
-    const inj = ReflectiveInjector.resolveAndCreate(sampleProviders);
+    var inj = ReflectiveInjector.resolveAndCreate(sampleProviders);
-    const adapter: WebDriverAdapter = inj.get(WebDriverAdapter);
+    var adapter: WebDriverAdapter = inj.get(WebDriverAdapter);
    return Promise
        .all([adapter.capabilities(), adapter.executeScript('return window.navigator.userAgent;')])
        .then((args) => {
-          const capabilities = args[0];
+          var capabilities = args[0];
-          const userAgent = args[1];
+          var userAgent = args[1];
          // This might still create instances twice. We are creating a new injector with all the
          // providers.
          // Only WebDriverAdapter is reused.
          // TODO vsavkin consider changing it when toAsyncFactory is added back or when child
          // injectors are handled better.
-          const injector = ReflectiveInjector.resolveAndCreate([
+          var injector = ReflectiveInjector.resolveAndCreate([
            sampleProviders, {provide: Options.CAPABILITIES, useValue: capabilities},
            {provide: Options.USER_AGENT, useValue: userAgent},
            {provide: WebDriverAdapter, useValue: adapter}
          ]);
-          const sampler = injector.get(Sampler);
+          var sampler = injector.get(Sampler);
          return sampler.sample();
        });
  }
 }
-const _DEFAULT_PROVIDERS = [
+var _DEFAULT_PROVIDERS = [
  Options.DEFAULT_PROVIDERS,
  Sampler.PROVIDERS,
  ConsoleReporter.PROVIDERS,
--- a/modules/@angular/benchpress/src/sample_description.ts
+++ b/modules/@angular/benchpress/src/sample_description.ts
@ -9,6 +9,7 @@
 import {OpaqueToken} from '@angular/core';
 import {Options} from './common_options';
 import {StringMapWrapper} from './facade/collection';
 import {Metric} from './metric';
 import {Validator} from './validator';
@ -41,7 +42,7 @@ export class SampleDescription {
      public metrics: {[key: string]: any}) {
    this.description = {};
    descriptions.forEach(description => {
-      Object.keys(description).forEach(prop => { this.description[prop] = description[prop]; });
+      StringMapWrapper.forEach(description, (value, prop) => this.description[prop] = value);
    });
  }
--- 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} from '@angular/core';
+import {Inject, Injectable, OpaqueToken} from '@angular/core';
 import {Options} from './common_options';
-import {isPresent} from './facade/lang';
+import {Date, DateWrapper, isBlank, isPresent} from './facade/lang';
 import {MeasureValues} from './measure_values';
 import {Metric} from './metric';
 import {Reporter} from './reporter';
@ -49,7 +49,7 @@ export class Sampler {
  }
  private _iterate(lastState: SampleState): Promise<SampleState> {
-    let resultPromise: Promise<SampleState>;
+    var resultPromise: Promise<SampleState>;
    if (this._prepare !== Options.NO_PREPARE) {
      resultPromise = this._driver.waitFor(this._prepare);
    } else {
@ -64,10 +64,10 @@ export class Sampler {
  }
  private _report(state: SampleState, metricValues: {[key: string]: any}): Promise<SampleState> {
-    const measureValues = new MeasureValues(state.completeSample.length, this._now(), metricValues);
+    var measureValues = new MeasureValues(state.completeSample.length, this._now(), metricValues);
-    const completeSample = state.completeSample.concat([measureValues]);
+    var completeSample = state.completeSample.concat([measureValues]);
-    const validSample = this._validator.validate(completeSample);
+    var validSample = this._validator.validate(completeSample);
-    let resultPromise = this._reporter.reportMeasureValues(measureValues);
+    var resultPromise = this._reporter.reportMeasureValues(measureValues);
    if (isPresent(validSample)) {
      resultPromise =
          resultPromise.then((_) => this._reporter.reportSample(completeSample, validSample));
--- a/modules/@angular/benchpress/src/statistic.ts
+++ b/modules/@angular/benchpress/src/statistic.ts
@ -6,20 +6,22 @@
 * found in the LICENSE file at https://angular.io/license
 */
 import {Math} from './facade/math';
 export class Statistic {
  static calculateCoefficientOfVariation(sample: number[], mean: number) {
    return Statistic.calculateStandardDeviation(sample, mean) / mean * 100;
  }
  static calculateMean(samples: number[]) {
-    let total = 0;
+    var total = 0;
    // TODO: use reduce
    samples.forEach(x => total += x);
    return total / samples.length;
  }
  static calculateStandardDeviation(samples: number[], mean: number) {
-    let deviation = 0;
+    var deviation = 0;
    // TODO: use reduce
    samples.forEach(x => deviation += Math.pow(x - mean, 2));
    deviation = deviation / (samples.length);
@ -30,9 +32,9 @@ export class Statistic {
  static calculateRegressionSlope(
      xValues: number[], xMean: number, yValues: number[], yMean: number) {
    // See http://en.wikipedia.org/wiki/Simple_linear_regression
-    let dividendSum = 0;
+    var dividendSum = 0;
-    let divisorSum = 0;
+    var divisorSum = 0;
-    for (let i = 0; i < xValues.length; i++) {
+    for (var i = 0; i < xValues.length; i++) {
      dividendSum += (xValues[i] - xMean) * (yValues[i] - yMean);
      divisorSum += Math.pow(xValues[i] - xMean, 2);
    }
--- a/modules/@angular/benchpress/src/validator/regression_slope_validator.ts
+++ b/modules/@angular/benchpress/src/validator/regression_slope_validator.ts
@ -8,10 +8,13 @@
 import {Inject, Injectable, OpaqueToken} from '@angular/core';
 import {ListWrapper} from '../facade/collection';
 import {MeasureValues} from '../measure_values';
 import {Statistic} from '../statistic';
 import {Validator} from '../validator';
 /**
 * A validator that checks the regression slope of a specific metric.
 * Waits for the regression slope to be >=0.
@ -37,17 +40,17 @@ export class RegressionSlopeValidator extends Validator {
  validate(completeSample: MeasureValues[]): MeasureValues[] {
    if (completeSample.length >= this._sampleSize) {
-      const latestSample =
+      var latestSample = ListWrapper.slice(
-          completeSample.slice(completeSample.length - this._sampleSize, completeSample.length);
+          completeSample, completeSample.length - this._sampleSize, completeSample.length);
-      const xValues: number[] = [];
+      var xValues: number[] = [];
-      const yValues: number[] = [];
+      var yValues: number[] = [];
-      for (let i = 0; i < latestSample.length; i++) {
+      for (var i = 0; i < latestSample.length; i++) {
        // For now, we only use the array index as x value.
        // TODO(tbosch): think about whether we should use time here instead
        xValues.push(i);
        yValues.push(latestSample[i].values[this._metric]);
      }
-      const regressionSlope = Statistic.calculateRegressionSlope(
+      var regressionSlope = Statistic.calculateRegressionSlope(
          xValues, Statistic.calculateMean(xValues), yValues, Statistic.calculateMean(yValues));
      return regressionSlope >= 0 ? latestSample : null;
    } else {
--- a/modules/@angular/benchpress/src/validator/size_validator.ts
+++ b/modules/@angular/benchpress/src/validator/size_validator.ts
@ -8,9 +8,12 @@
 import {Inject, Injectable, OpaqueToken} from '@angular/core';
 import {ListWrapper} from '../facade/collection';
 import {MeasureValues} from '../measure_values';
 import {Validator} from '../validator';
 /**
 * A validator that waits for the sample to have a certain size.
 */
@ -25,7 +28,8 @@ export class SizeValidator extends Validator {
  validate(completeSample: MeasureValues[]): MeasureValues[] {
    if (completeSample.length >= this._sampleSize) {
-      return completeSample.slice(completeSample.length - this._sampleSize, completeSample.length);
+      return ListWrapper.slice(
          completeSample, completeSample.length - this._sampleSize, completeSample.length);
    } else {
      return null;
    }
--- a/modules/@angular/benchpress/src/web_driver_extension.ts
+++ b/modules/@angular/benchpress/src/web_driver_extension.ts
@ -9,6 +9,7 @@
 import {Injector, OpaqueToken} from '@angular/core';
 import {Options} from './common_options';
 import {isBlank, isPresent} from './facade/lang';
 export type PerfLogEvent = {
  [key: string]: any
@ -34,7 +35,7 @@ export type PerfLogEvent = {
 */
 export abstract class WebDriverExtension {
  static provideFirstSupported(childTokens: any[]): any[] {
-    const res = [
+    var res = [
      {
        provide: _CHILDREN,
        useFactory: (injector: Injector) => childTokens.map(token => injector.get(token)),
@ -43,13 +44,13 @@ export abstract class WebDriverExtension {
      {
        provide: WebDriverExtension,
        useFactory: (children: WebDriverExtension[], capabilities: {[key: string]: any}) => {
-          let delegate: WebDriverExtension;
+          var delegate: WebDriverExtension;
          children.forEach(extension => {
            if (extension.supports(capabilities)) {
              delegate = extension;
            }
          });
-          if (!delegate) {
+          if (isBlank(delegate)) {
            throw new Error('Could not find a delegate for given capabilities!');
          }
          return delegate;
@ -101,4 +102,4 @@ export class PerfLogFeatures {
  }
 }
-const _CHILDREN = new OpaqueToken('WebDriverExtension.children');
+var _CHILDREN = new OpaqueToken('WebDriverExtension.children');
--- a/modules/@angular/benchpress/src/webdriver/chrome_driver_extension.ts
+++ b/modules/@angular/benchpress/src/webdriver/chrome_driver_extension.ts
@ -34,7 +34,7 @@ export class ChromeDriverExtension extends WebDriverExtension {
    if (!userAgent) {
      return -1;
    }
-    let v = userAgent.split(/Chrom(e|ium)\//g)[2];
+    var v = userAgent.split(/Chrom(e|ium)\//g)[2];
    if (!v) {
      return -1;
    }
@ -52,7 +52,7 @@ export class ChromeDriverExtension extends WebDriverExtension {
  }
  timeEnd(name: string, restartName: string = null): Promise<any> {
-    let script = `console.timeEnd('${name}');`;
+    var script = `console.timeEnd('${name}');`;
    if (restartName) {
      script += `console.time('${restartName}');`;
    }
@ -67,9 +67,9 @@ export class ChromeDriverExtension extends WebDriverExtension {
    return this._driver.executeScript('1+1')
        .then((_) => this._driver.logs('performance'))
        .then((entries) => {
-          const events: PerfLogEvent[] = [];
+          var events: PerfLogEvent[] = [];
          entries.forEach(entry => {
-            const message = JSON.parse(entry['message'])['message'];
+            var message = JSON.parse(entry['message'])['message'];
            if (message['method'] === 'Tracing.dataCollected') {
              events.push(message['params']);
            }
@ -95,8 +95,8 @@ export class ChromeDriverExtension extends WebDriverExtension {
  }
  private _convertEvent(event: {[key: string]: any}, categories: string[]) {
-    const name = event['name'];
+    var name = event['name'];
-    const args = event['args'];
+    var args = event['args'];
    if (this._isEvent(categories, name, ['blink.console'])) {
      return normalizeEvent(event, {'name': name});
    } else if (this._isEvent(
@ -109,7 +109,7 @@ export class ChromeDriverExtension extends WebDriverExtension {
      //               new surfaces framework (not broadly enabled yet)
      //   3rd choice: BenchmarkInstrumentation::ImplThreadRenderingStats - fallback event that is
      //               always available if something is rendered
-      const frameCount = event['args']['data']['frame_count'];
+      var frameCount = event['args']['data']['frame_count'];
      if (frameCount > 1) {
        throw new Error('multi-frame render stats not supported');
      }
@ -122,14 +122,14 @@ export class ChromeDriverExtension extends WebDriverExtension {
            categories, name, ['disabled-by-default-devtools.timeline'], 'CompositeLayers')) {
      return normalizeEvent(event, {'name': 'render'});
    } else if (this._isEvent(categories, name, ['devtools.timeline', 'v8'], 'MajorGC')) {
-      const normArgs = {
+      var normArgs = {
        'majorGc': true,
        'usedHeapSize': args['usedHeapSizeAfter'] !== undefined ? args['usedHeapSizeAfter'] :
                                                                  args['usedHeapSizeBefore']
      };
      return normalizeEvent(event, {'name': 'gc', 'args': normArgs});
    } else if (this._isEvent(categories, name, ['devtools.timeline', 'v8'], 'MinorGC')) {
-      const normArgs = {
+      var normArgs = {
        'majorGc': false,
        'usedHeapSize': args['usedHeapSizeAfter'] !== undefined ? args['usedHeapSizeAfter'] :
                                                                  args['usedHeapSizeBefore']
@ -151,11 +151,11 @@ export class ChromeDriverExtension extends WebDriverExtension {
        this._isEvent(categories, name, ['devtools.timeline'], 'Paint')) {
      return normalizeEvent(event, {'name': 'render'});
    } else if (this._isEvent(categories, name, ['devtools.timeline'], 'ResourceReceivedData')) {
-      const normArgs = {'encodedDataLength': args['data']['encodedDataLength']};
+      let normArgs = {'encodedDataLength': args['data']['encodedDataLength']};
      return normalizeEvent(event, {'name': 'receivedData', 'args': normArgs});
    } else if (this._isEvent(categories, name, ['devtools.timeline'], 'ResourceSendRequest')) {
-      const data = args['data'];
+      let data = args['data'];
-      const normArgs = {'url': data['url'], 'method': data['requestMethod']};
+      let normArgs = {'url': data['url'], 'method': data['requestMethod']};
      return normalizeEvent(event, {'name': 'sendRequest', 'args': normArgs});
    } else if (this._isEvent(categories, name, ['blink.user_timing'], 'navigationStart')) {
      return normalizeEvent(event, {'name': 'navigationStart'});
@ -168,8 +168,8 @@ export class ChromeDriverExtension extends WebDriverExtension {
  private _isEvent(
      eventCategories: string[], eventName: string, expectedCategories: string[],
      expectedName: string = null): boolean {
-    const hasCategories = expectedCategories.reduce(
+    var hasCategories = expectedCategories.reduce(
-        (value, cat) => value && eventCategories.indexOf(cat) !== -1, true);
+        (value, cat) => { return value && eventCategories.indexOf(cat) !== -1; }, true);
    return !expectedName ? hasCategories : hasCategories && eventName === expectedName;
  }
@ -183,7 +183,7 @@ export class ChromeDriverExtension extends WebDriverExtension {
 }
 function normalizeEvent(chromeEvent: {[key: string]: any}, data: PerfLogEvent): PerfLogEvent {
-  let ph = chromeEvent['ph'].toUpperCase();
+  var ph = chromeEvent['ph'].toUpperCase();
  if (ph === 'S') {
    ph = 'B';
  } else if (ph === 'F') {
@ -192,16 +192,16 @@ function normalizeEvent(chromeEvent: {[key: string]: any}, data: PerfLogEvent):
    // mark events from navigation timing
    ph = 'I';
  }
-  const result: {[key: string]: any} =
+  var result: {[key: string]: any} =
      {'pid': chromeEvent['pid'], 'ph': ph, 'cat': 'timeline', 'ts': chromeEvent['ts'] / 1000};
  if (ph === 'X') {
-    let dur = chromeEvent['dur'];
+    var dur = chromeEvent['dur'];
    if (dur === undefined) {
      dur = chromeEvent['tdur'];
    }
    result['dur'] = !dur ? 0.0 : dur / 1000;
  }
-  for (const prop in data) {
+  for (let prop in data) {
    result[prop] = data[prop];
  }
  return result;
--- a/modules/@angular/benchpress/src/webdriver/firefox_driver_extension.ts
+++ b/modules/@angular/benchpress/src/webdriver/firefox_driver_extension.ts
@ -8,7 +8,7 @@
 import {Injectable} from '@angular/core';
-import {isPresent} from '../facade/lang';
+import {StringWrapper, isPresent} from '../facade/lang';
 import {WebDriverAdapter} from '../web_driver_adapter';
 import {PerfLogEvent, PerfLogFeatures, WebDriverExtension} from '../web_driver_extension';
@ -34,7 +34,7 @@ export class FirefoxDriverExtension extends WebDriverExtension {
  }
  timeEnd(name: string, restartName: string = null): Promise<any> {
-    let script = 'window.markEnd("' + name + '");';
+    var script = 'window.markEnd("' + name + '");';
    if (isPresent(restartName)) {
      script += 'window.markStart("' + restartName + '");';
    }
@ -48,6 +48,6 @@ export class FirefoxDriverExtension extends WebDriverExtension {
  perfLogFeatures(): PerfLogFeatures { return new PerfLogFeatures({render: true, gc: true}); }
  supports(capabilities: {[key: string]: any}): boolean {
-    return capabilities['browserName'].toLowerCase() === 'firefox';
+    return StringWrapper.equals(capabilities['browserName'].toLowerCase(), 'firefox');
  }
 }
--- a/modules/@angular/benchpress/src/webdriver/ios_driver_extension.ts
+++ b/modules/@angular/benchpress/src/webdriver/ios_driver_extension.ts
@ -8,7 +8,7 @@
 import {Injectable} from '@angular/core';
-import {isBlank, isPresent} from '../facade/lang';
+import {StringWrapper, isBlank, isPresent} from '../facade/lang';
 import {WebDriverAdapter} from '../web_driver_adapter';
 import {PerfLogEvent, PerfLogFeatures, WebDriverExtension} from '../web_driver_extension';
@ -25,7 +25,7 @@ export class IOsDriverExtension extends WebDriverExtension {
  }
  timeEnd(name: string, restartName: string = null): Promise<any> {
-    let script = `console.timeEnd('${name}');`;
+    var script = `console.timeEnd('${name}');`;
    if (isPresent(restartName)) {
      script += `console.time('${restartName}');`;
    }
@ -39,10 +39,10 @@ export class IOsDriverExtension extends WebDriverExtension {
    return this._driver.executeScript('1+1')
        .then((_) => this._driver.logs('performance'))
        .then((entries) => {
-          const records: any[] = [];
+          var records: any[] = [];
          entries.forEach(entry => {
-            const message = JSON.parse(entry['message'])['message'];
+            var message = JSON.parse(entry['message'])['message'];
-            if (message['method'] === 'Timeline.eventRecorded') {
+            if (StringWrapper.equals(message['method'], 'Timeline.eventRecorded')) {
              records.push(message['params']['record']);
            }
          });
@ -52,26 +52,29 @@ export class IOsDriverExtension extends WebDriverExtension {
  /** @internal */
  private _convertPerfRecordsToEvents(records: any[], events: PerfLogEvent[] = null) {
-    if (!events) {
+    if (isBlank(events)) {
      events = [];
    }
    records.forEach((record) => {
-      let endEvent: PerfLogEvent = null;
+      var endEvent: PerfLogEvent = null;
-      const type = record['type'];
+      var type = record['type'];
-      const data = record['data'];
+      var data = record['data'];
-      const startTime = record['startTime'];
+      var startTime = record['startTime'];
-      const endTime = record['endTime'];
+      var endTime = record['endTime'];
-      if (type === 'FunctionCall' && (data == null || data['scriptName'] !== 'InjectedScript')) {
+      if (StringWrapper.equals(type, 'FunctionCall') &&
          (isBlank(data) || !StringWrapper.equals(data['scriptName'], 'InjectedScript'))) {
        events.push(createStartEvent('script', startTime));
        endEvent = createEndEvent('script', endTime);
-      } else if (type === 'Time') {
+      } else if (StringWrapper.equals(type, 'Time')) {
        events.push(createMarkStartEvent(data['message'], startTime));
-      } else if (type === 'TimeEnd') {
+      } else if (StringWrapper.equals(type, 'TimeEnd')) {
        events.push(createMarkEndEvent(data['message'], startTime));
      } else if (
-          type === 'RecalculateStyles' || type === 'Layout' || type === 'UpdateLayerTree' ||
+          StringWrapper.equals(type, 'RecalculateStyles') || StringWrapper.equals(type, 'Layout') ||
-          type === 'Paint' || type === 'Rasterize' || type === 'CompositeLayers') {
+          StringWrapper.equals(type, 'UpdateLayerTree') || StringWrapper.equals(type, 'Paint') ||
          StringWrapper.equals(type, 'Rasterize') ||
          StringWrapper.equals(type, 'CompositeLayers')) {
        events.push(createStartEvent('render', startTime));
        endEvent = createEndEvent('render', endTime);
      }
@ -89,13 +92,13 @@ export class IOsDriverExtension extends WebDriverExtension {
  perfLogFeatures(): PerfLogFeatures { return new PerfLogFeatures({render: true}); }
  supports(capabilities: {[key: string]: any}): boolean {
-    return capabilities['browserName'].toLowerCase() === 'safari';
+    return StringWrapper.equals(capabilities['browserName'].toLowerCase(), 'safari');
  }
 }
 function createEvent(
    ph: 'X' | 'B' | 'E' | 'B' | 'E', name: string, time: number, args: any = null) {
-  const result: PerfLogEvent = {
+  var result: PerfLogEvent = {
    'cat': 'timeline',
    'name': name,
    'ts': time,
--- a/modules/@angular/benchpress/test/firefox_extension/conf.ts
+++ b/modules/@angular/benchpress/test/firefox_extension/conf.ts
@ -8,7 +8,7 @@
 require('core-js');
 require('reflect-metadata');
-const testHelper = require('../../src/firefox_extension/lib/test_helper.js');
+var testHelper = require('../../src/firefox_extension/lib/test_helper.js');
 exports.config = {
  specs: ['spec.js', 'sample_benchmark.js'],
--- a/modules/@angular/benchpress/test/firefox_extension/parser_util_spec.ts
+++ b/modules/@angular/benchpress/test/firefox_extension/parser_util_spec.ts
@ -10,10 +10,10 @@ import {convertPerfProfileToEvents} from '../../src/firefox_extension/lib/parser
 function assertEventsEqual(actualEvents: any[], expectedEvents: any[]) {
  expect(actualEvents.length == expectedEvents.length);
-  for (let i = 0; i < actualEvents.length; ++i) {
+  for (var i = 0; i < actualEvents.length; ++i) {
-    const actualEvent = actualEvents[i];
+    var actualEvent = actualEvents[i];
-    const expectedEvent = expectedEvents[i];
+    var expectedEvent = expectedEvents[i];
-    for (const key in actualEvent) {
+    for (var key in actualEvent) {
      expect(actualEvent[key]).toEqual(expectedEvent[key]);
    }
  }
@ -22,17 +22,17 @@ function assertEventsEqual(actualEvents: any[], expectedEvents: any[]) {
 export function main() {
  describe('convertPerfProfileToEvents', function() {
    it('should convert single instantaneous event', function() {
-      const profileData = {
+      var profileData = {
        threads: [
          {samples: [{time: 1, frames: [{location: 'FirefoxDriver.prototype.executeScript'}]}]}
        ]
      };
-      const perfEvents = convertPerfProfileToEvents(profileData);
+      var perfEvents = convertPerfProfileToEvents(profileData);
      assertEventsEqual(perfEvents, [{ph: 'X', ts: 1, name: 'script'}]);
    });
    it('should convert single non-instantaneous event', function() {
-      const profileData = {
+      var profileData = {
        threads: [{
          samples: [
            {time: 1, frames: [{location: 'FirefoxDriver.prototype.executeScript'}]},
@ -41,13 +41,13 @@ export function main() {
          ]
        }]
      };
-      const perfEvents = convertPerfProfileToEvents(profileData);
+      var perfEvents = convertPerfProfileToEvents(profileData);
      assertEventsEqual(
          perfEvents, [{ph: 'B', ts: 1, name: 'script'}, {ph: 'E', ts: 100, name: 'script'}]);
    });
    it('should convert multiple instantaneous events', function() {
-      const profileData = {
+      var profileData = {
        threads: [{
          samples: [
            {time: 1, frames: [{location: 'FirefoxDriver.prototype.executeScript'}]},
@ -55,13 +55,13 @@ export function main() {
          ]
        }]
      };
-      const perfEvents = convertPerfProfileToEvents(profileData);
+      var perfEvents = convertPerfProfileToEvents(profileData);
      assertEventsEqual(
          perfEvents, [{ph: 'X', ts: 1, name: 'script'}, {ph: 'X', ts: 2, name: 'render'}]);
    });
    it('should convert multiple mixed events', function() {
-      const profileData = {
+      var profileData = {
        threads: [{
          samples: [
            {time: 1, frames: [{location: 'FirefoxDriver.prototype.executeScript'}]},
@ -71,7 +71,7 @@ export function main() {
          ]
        }]
      };
-      const perfEvents = convertPerfProfileToEvents(profileData);
+      var perfEvents = convertPerfProfileToEvents(profileData);
      assertEventsEqual(perfEvents, [
        {ph: 'X', ts: 1, name: 'script'}, {ph: 'X', ts: 2, name: 'render'},
        {ph: 'B', ts: 5, name: 'script'}, {ph: 'E', ts: 10, name: 'script'}
@ -79,13 +79,13 @@ export function main() {
    });
    it('should add args to gc events', function() {
-      const profileData = {threads: [{samples: [{time: 1, frames: [{location: 'forceGC'}]}]}]};
+      var profileData = {threads: [{samples: [{time: 1, frames: [{location: 'forceGC'}]}]}]};
-      const perfEvents = convertPerfProfileToEvents(profileData);
+      var perfEvents = convertPerfProfileToEvents(profileData);
      assertEventsEqual(perfEvents, [{ph: 'X', ts: 1, name: 'gc', args: {usedHeapSize: 0}}]);
    });
    it('should skip unknown events', function() {
-      const profileData = {
+      var profileData = {
        threads: [{
          samples: [
            {time: 1, frames: [{location: 'FirefoxDriver.prototype.executeScript'}]},
@ -93,7 +93,7 @@ export function main() {
          ]
        }]
      };
-      const perfEvents = convertPerfProfileToEvents(profileData);
+      var perfEvents = convertPerfProfileToEvents(profileData);
      assertEventsEqual(perfEvents, [{ph: 'X', ts: 1, name: 'script'}]);
    });
  });
--- a/modules/@angular/benchpress/test/firefox_extension/sample_benchmark.ts
+++ b/modules/@angular/benchpress/test/firefox_extension/sample_benchmark.ts
@ -6,10 +6,8 @@
 * found in the LICENSE file at https://angular.io/license
 */
-import {$, browser} from 'protractor';
+var benchpress = require('../../index.js');
-
+var runner = new benchpress.Runner([
 const benchpress = require('../../index.js');
 const runner = new benchpress.Runner([
  // use protractor as Webdriver client
  benchpress.SeleniumWebDriverAdapter.PROTRACTOR_PROVIDERS,
  // use RegressionSlopeValidator to validate samples
--- a/modules/@angular/benchpress/test/firefox_extension/spec.ts
+++ b/modules/@angular/benchpress/test/firefox_extension/spec.ts
@ -6,11 +6,9 @@
 * found in the LICENSE file at https://angular.io/license
 */
-import {browser} from 'protractor';
+var assertEventsContainsName = function(events: any[], eventName: string) {
-
+  var found = false;
-const assertEventsContainsName = function(events: any[], eventName: string) {
+  for (var i = 0; i < events.length; ++i) {
  let found = false;
  for (let i = 0; i < events.length; ++i) {
    if (events[i].name == eventName) {
      found = true;
      break;
@ -20,7 +18,7 @@ const assertEventsContainsName = function(events: any[], eventName: string) {
 };
 describe('firefox extension', function() {
-  const TEST_URL = 'http://localhost:8001/playground/src/hello_world/index.html';
+  var TEST_URL = 'http://localhost:8001/playground/src/hello_world/index.html';
  it('should measure performance', function() {
    browser.sleep(3000);  // wait for extension to load
--- a/modules/@angular/benchpress/test/metric/multi_metric_spec.ts
+++ b/modules/@angular/benchpress/test/metric/multi_metric_spec.ts
@ -6,17 +6,17 @@
 * found in the LICENSE file at https://angular.io/license
 */
-import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
+import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
 import {Metric, MultiMetric, ReflectiveInjector} from '../../index';
 export function main() {
  function createMetric(ids: any[]) {
-    const m = ReflectiveInjector
+    var m = ReflectiveInjector
-                  .resolveAndCreate([
+                .resolveAndCreate([
-                    ids.map(id => ({provide: id, useValue: new MockMetric(id)})),
+                  ids.map(id => { return {provide: id, useValue: new MockMetric(id)}; }),
-                    MultiMetric.provideWith(ids)
+                  MultiMetric.provideWith(ids)
-                  ])
+                ])
-                  .get(MultiMetric);
+                .get(MultiMetric);
    return Promise.resolve(m);
  }
@ -56,13 +56,13 @@ class MockMetric extends Metric {
  beginMeasure(): Promise<string> { return Promise.resolve(`${this._id}_beginMeasure`); }
  endMeasure(restart: boolean): Promise<{[key: string]: any}> {
-    const result: {[key: string]: any} = {};
+    var result: {[key: string]: any} = {};
    result[this._id] = {'restart': restart};
    return Promise.resolve(result);
  }
  describe(): {[key: string]: string} {
-    const result: {[key: string]: string} = {};
+    var result: {[key: string]: string} = {};
    result[this._id] = 'describe';
    return result;
  }
--- a/modules/@angular/benchpress/test/metric/perflog_metric_spec.ts
+++ b/modules/@angular/benchpress/test/metric/perflog_metric_spec.ts
@ -7,15 +7,16 @@
 */
 import {Provider} from '@angular/core';
-import {AsyncTestCompleter, beforeEach, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
+import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
 import {Metric, Options, PerfLogEvent, PerfLogFeatures, PerflogMetric, ReflectiveInjector, WebDriverExtension} from '../../index';
-import {isPresent} from '../../src/facade/lang';
+import {StringMapWrapper} from '../../src/facade/collection';
 import {isBlank, isPresent} from '../../src/facade/lang';
 import {TraceEventFactory} from '../trace_event_factory';
 export function main() {
-  let commandLog: any[];
+  var commandLog: any[];
-  const eventFactory = new TraceEventFactory('timeline', 'pid0');
+  var eventFactory = new TraceEventFactory('timeline', 'pid0');
  function createMetric(
      perfLogs: PerfLogEvent[], perfLogFeatures: PerfLogFeatures,
@ -27,14 +28,14 @@ export function main() {
        requestCount?: boolean
      } = {}): Metric {
    commandLog = [];
-    if (!perfLogFeatures) {
+    if (isBlank(perfLogFeatures)) {
      perfLogFeatures =
          new PerfLogFeatures({render: true, gc: true, frameCapture: true, userTiming: true});
    }
-    if (!microMetrics) {
+    if (isBlank(microMetrics)) {
      microMetrics = {};
    }
-    const providers: Provider[] = [
+    var providers: Provider[] = [
      Options.DEFAULT_PROVIDERS, PerflogMetric.PROVIDERS,
      {provide: Options.MICRO_METRICS, useValue: microMetrics}, {
        provide: PerflogMetric.SET_TIMEOUT,
@ -66,8 +67,8 @@ export function main() {
  describe('perflog metric', () => {
    function sortedKeys(stringMap: {[key: string]: any}) {
-      const res: string[] = [];
+      var res: string[] = [];
-      res.push(...Object.keys(stringMap));
+      StringMapWrapper.forEach(stringMap, (_, key) => { res.push(key); });
      res.sort();
      return res;
    }
@ -102,15 +103,15 @@ export function main() {
    });
    it('should describe itself based on micro metrics', () => {
-      const description =
+      var description =
          createMetric([[]], null, {microMetrics: {'myMicroMetric': 'someDesc'}}).describe();
      expect(description['myMicroMetric']).toEqual('someDesc');
    });
    it('should describe itself if frame capture is requested and available', () => {
-      const description = createMetric([[]], new PerfLogFeatures({frameCapture: true}), {
+      var description = createMetric([[]], new PerfLogFeatures({frameCapture: true}), {
-                            captureFrames: true
+                          captureFrames: true
-                          }).describe();
+                        }).describe();
      expect(description['frameTime.mean']).not.toContain('WARNING');
      expect(description['frameTime.best']).not.toContain('WARNING');
      expect(description['frameTime.worst']).not.toContain('WARNING');
@ -118,9 +119,9 @@ export function main() {
    });
    it('should describe itself if frame capture is requested and not available', () => {
-      const description = createMetric([[]], new PerfLogFeatures({frameCapture: false}), {
+      var description = createMetric([[]], new PerfLogFeatures({frameCapture: false}), {
-                            captureFrames: true
+                          captureFrames: true
-                          }).describe();
+                        }).describe();
      expect(description['frameTime.mean']).toContain('WARNING');
      expect(description['frameTime.best']).toContain('WARNING');
      expect(description['frameTime.worst']).toContain('WARNING');
@ -131,7 +132,7 @@ export function main() {
      it('should not force gc and mark the timeline',
         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
-           const metric = createMetric([[]], null);
+           var metric = createMetric([[]], null);
           metric.beginMeasure().then((_) => {
             expect(commandLog).toEqual([['timeBegin', 'benchpress0']]);
@ -141,7 +142,7 @@ export function main() {
      it('should force gc and mark the timeline',
         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
-           const metric = createMetric([[]], null, {forceGc: true});
+           var metric = createMetric([[]], null, {forceGc: true});
           metric.beginMeasure().then((_) => {
             expect(commandLog).toEqual([['gc'], ['timeBegin', 'benchpress0']]);
@ -155,11 +156,11 @@ export function main() {
      it('should mark and aggregate events in between the marks',
         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
-           const events = [[
+           var events = [[
             eventFactory.markStart('benchpress0', 0), eventFactory.start('script', 4),
             eventFactory.end('script', 6), eventFactory.markEnd('benchpress0', 10)
           ]];
-           const metric = createMetric(events, null);
+           var metric = createMetric(events, null);
           metric.beginMeasure().then((_) => metric.endMeasure(false)).then((data) => {
             expect(commandLog).toEqual([
               ['timeBegin', 'benchpress0'], ['timeEnd', 'benchpress0', null], 'readPerfLog'
@ -172,13 +173,13 @@ export function main() {
      it('should mark and aggregate events since navigationStart',
         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
-           const events = [[
+           var events = [[
             eventFactory.markStart('benchpress0', 0), eventFactory.start('script', 4),
             eventFactory.end('script', 6), eventFactory.instant('navigationStart', 7),
             eventFactory.start('script', 8), eventFactory.end('script', 9),
             eventFactory.markEnd('benchpress0', 10)
           ]];
-           const metric = createMetric(events, null);
+           var metric = createMetric(events, null);
           metric.beginMeasure().then((_) => metric.endMeasure(false)).then((data) => {
             expect(data['scriptTime']).toBe(1);
@ -187,7 +188,7 @@ export function main() {
         }));
      it('should restart timing', inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
-           const events = [
+           var events = [
             [
               eventFactory.markStart('benchpress0', 0),
               eventFactory.markEnd('benchpress0', 1),
@ -195,7 +196,7 @@ export function main() {
             ],
             [eventFactory.markEnd('benchpress1', 3)]
           ];
-           const metric = createMetric(events, null);
+           var metric = createMetric(events, null);
           metric.beginMeasure()
               .then((_) => metric.endMeasure(true))
               .then((_) => metric.endMeasure(true))
@ -211,7 +212,7 @@ export function main() {
      it('should loop and aggregate until the end mark is present',
         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
-           const events = [
+           var events = [
             [eventFactory.markStart('benchpress0', 0), eventFactory.start('script', 1)],
             [eventFactory.end('script', 2)],
             [
@ -219,7 +220,7 @@ export function main() {
               eventFactory.markEnd('benchpress0', 10)
             ]
           ];
-           const metric = createMetric(events, null);
+           var metric = createMetric(events, null);
           metric.beginMeasure().then((_) => metric.endMeasure(false)).then((data) => {
             expect(commandLog).toEqual([
               ['timeBegin', 'benchpress0'], ['timeEnd', 'benchpress0', null], 'readPerfLog',
@ -233,7 +234,7 @@ export function main() {
      it('should store events after the end mark for the next call',
         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
-           const events = [
+           var events = [
             [
               eventFactory.markStart('benchpress0', 0), eventFactory.markEnd('benchpress0', 1),
               eventFactory.markStart('benchpress1', 1), eventFactory.start('script', 1),
@ -244,7 +245,7 @@ export function main() {
               eventFactory.markEnd('benchpress1', 6)
             ]
           ];
-           const metric = createMetric(events, null);
+           var metric = createMetric(events, null);
           metric.beginMeasure()
               .then((_) => metric.endMeasure(true))
               .then((data) => {
@ -263,7 +264,7 @@ export function main() {
         }));
      describe('with forced gc', () => {
-        let events: PerfLogEvent[][];
+        var events: PerfLogEvent[][];
        beforeEach(() => {
          events = [[
            eventFactory.markStart('benchpress0', 0), eventFactory.start('script', 4),
@ -276,7 +277,7 @@ export function main() {
        });
        it('should measure forced gc', inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
-             const metric = createMetric(events, null, {forceGc: true});
+             var metric = createMetric(events, null, {forceGc: true});
             metric.beginMeasure().then((_) => metric.endMeasure(false)).then((data) => {
               expect(commandLog).toEqual([
                 ['gc'], ['timeBegin', 'benchpress0'], ['timeEnd', 'benchpress0', 'benchpress1'],
@ -291,7 +292,7 @@ export function main() {
        it('should restart after the forced gc if needed',
           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
-             const metric = createMetric(events, null, {forceGc: true});
+             var metric = createMetric(events, null, {forceGc: true});
             metric.beginMeasure().then((_) => metric.endMeasure(true)).then((data) => {
               expect(commandLog[5]).toEqual(['timeEnd', 'benchpress1', 'benchpress2']);
@ -313,7 +314,7 @@ export function main() {
      } = {}) {
        events.unshift(eventFactory.markStart('benchpress0', 0));
        events.push(eventFactory.markEnd('benchpress0', 10));
-        const metric = createMetric([events], null, {
+        var metric = createMetric([events], null, {
          microMetrics: microMetrics,
          captureFrames: captureFrames,
          receivedData: receivedData,
@ -502,8 +503,8 @@ export function main() {
      it('should ignore events from different processed as the start mark',
         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
-           const otherProcessEventFactory = new TraceEventFactory('timeline', 'pid1');
+           var otherProcessEventFactory = new TraceEventFactory('timeline', 'pid1');
-           const metric = createMetric(
+           var metric = createMetric(
               [[
                 eventFactory.markStart('benchpress0', 0), eventFactory.start('script', 0, null),
                 eventFactory.end('script', 5, null),
@ -685,7 +686,7 @@ class MockDriverExtension extends WebDriverExtension {
  readPerfLog(): Promise<any> {
    this._commandLog.push('readPerfLog');
    if (this._perfLogs.length > 0) {
-      const next = this._perfLogs[0];
+      var next = this._perfLogs[0];
      this._perfLogs.shift();
      return Promise.resolve(next);
    } else {
--- a/modules/@angular/benchpress/test/metric/user_metric_spec.ts
+++ b/modules/@angular/benchpress/test/metric/user_metric_spec.ts
@ -7,25 +7,27 @@
 */
 import {Provider, ReflectiveInjector} from '@angular/core';
-import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
+import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
-import {Options, PerfLogEvent, PerfLogFeatures, UserMetric, WebDriverAdapter} from '../../index';
+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';
 export function main() {
-  let wdAdapter: MockDriverAdapter;
+  var wdAdapter: MockDriverAdapter;
  function createMetric(
      perfLogs: PerfLogEvent[], perfLogFeatures: PerfLogFeatures,
      {userMetrics}: {userMetrics?: {[key: string]: string}} = {}): UserMetric {
-    if (!perfLogFeatures) {
+    if (isBlank(perfLogFeatures)) {
      perfLogFeatures =
          new PerfLogFeatures({render: true, gc: true, frameCapture: true, userTiming: true});
    }
-    if (!userMetrics) {
+    if (isBlank(userMetrics)) {
      userMetrics = {};
    }
    wdAdapter = new MockDriverAdapter();
-    const providers: Provider[] = [
+    var providers: Provider[] = [
      Options.DEFAULT_PROVIDERS, UserMetric.PROVIDERS,
      {provide: Options.USER_METRICS, useValue: userMetrics},
      {provide: WebDriverAdapter, useValue: wdAdapter}
@ -45,7 +47,7 @@ export function main() {
    describe('endMeasure', () => {
      it('should stop measuring when all properties have numeric values',
         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
-           const metric = createMetric(
+           let metric = createMetric(
               [[]], new PerfLogFeatures(),
               {userMetrics: {'loadTime': 'time to load', 'content': 'time to see content'}});
           metric.beginMeasure()
@ -71,7 +73,7 @@ class MockDriverAdapter extends WebDriverAdapter {
  executeScript(script: string): any {
    // Just handles `return window.propName` ignores `delete window.propName`.
    if (script.indexOf('return window.') == 0) {
-      const metricName = script.substring('return window.'.length);
+      let metricName = script.substring('return window.'.length);
      return Promise.resolve(this.data[metricName]);
    } else if (script.indexOf('delete window.') == 0) {
      return Promise.resolve(null);
--- a/modules/@angular/benchpress/test/reporter/console_reporter_spec.ts
+++ b/modules/@angular/benchpress/test/reporter/console_reporter_spec.ts
@ -7,15 +7,15 @@
 */
 import {Provider} from '@angular/core';
-import {describe, expect, it} from '@angular/core/testing/testing_internal';
+import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
-import {ConsoleReporter, MeasureValues, ReflectiveInjector, SampleDescription} from '../../index';
+import {ConsoleReporter, MeasureValues, ReflectiveInjector, Reporter, SampleDescription, SampleState} from '../../index';
-import {isBlank, isPresent} from '../../src/facade/lang';
+import {Date, DateWrapper, isBlank, isPresent} from '../../src/facade/lang';
 export function main() {
  describe('console reporter', () => {
-    let reporter: ConsoleReporter;
+    var reporter: ConsoleReporter;
-    let log: string[];
+    var log: string[];
    function createReporter(
        {columnWidth = null, sampleId = null, descriptions = null, metrics = null}: {
@ -25,13 +25,13 @@ export function main() {
          metrics?: {[key: string]: any}
        }) {
      log = [];
-      if (!descriptions) {
+      if (isBlank(descriptions)) {
        descriptions = [];
      }
-      if (sampleId == null) {
+      if (isBlank(sampleId)) {
        sampleId = 'null';
      }
-      const providers: Provider[] = [
+      var providers: Provider[] = [
        ConsoleReporter.PROVIDERS, {
          provide: SampleDescription,
          useValue: new SampleDescription(sampleId, descriptions, metrics)
@ -90,5 +90,5 @@ export function main() {
 }
 function mv(runIndex: number, time: number, values: {[key: string]: number}) {
-  return new MeasureValues(runIndex, new Date(time), values);
+  return new MeasureValues(runIndex, DateWrapper.fromMillis(time), values);
 }
--- a/modules/@angular/benchpress/test/reporter/json_file_reporter_spec.ts
+++ b/modules/@angular/benchpress/test/reporter/json_file_reporter_spec.ts
@ -6,14 +6,14 @@
 * found in the LICENSE file at https://angular.io/license
 */
-import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
+import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
 import {JsonFileReporter, MeasureValues, Options, ReflectiveInjector, SampleDescription} from '../../index';
-import {isPresent} from '../../src/facade/lang';
+import {DateWrapper, Json, isPresent} from '../../src/facade/lang';
 export function main() {
  describe('file reporter', () => {
-    let loggedFile: any;
+    var loggedFile: any;
    function createReporter({sampleId, descriptions, metrics, path}: {
      sampleId: string,
@ -21,13 +21,13 @@ export function main() {
      metrics: {[key: string]: string},
      path: string
    }) {
-      const providers = [
+      var providers = [
        JsonFileReporter.PROVIDERS, {
          provide: SampleDescription,
          useValue: new SampleDescription(sampleId, descriptions, metrics)
        },
        {provide: JsonFileReporter.PATH, useValue: path},
-        {provide: Options.NOW, useValue: () => new Date(1234)}, {
+        {provide: Options.NOW, useValue: () => DateWrapper.fromMillis(1234)}, {
          provide: Options.WRITE_FILE,
          useValue: (filename: string, content: string) => {
            loggedFile = {'filename': filename, 'content': content};
@ -49,9 +49,9 @@ export function main() {
             .reportSample(
                 [mv(0, 0, {'a': 3, 'b': 6})],
                 [mv(0, 0, {'a': 3, 'b': 6}), mv(1, 1, {'a': 5, 'b': 9})]);
-         const regExp = /somePath\/someId_\d+\.json/;
+         var regExp = /somePath\/someId_\d+\.json/;
         expect(isPresent(loggedFile['filename'].match(regExp))).toBe(true);
-         const parsedContent = JSON.parse(loggedFile['content']);
+         var parsedContent = Json.parse(loggedFile['content']);
         expect(parsedContent).toEqual({
           'description': {
             'id': 'someId',
@ -77,5 +77,5 @@ export function main() {
 }
 function mv(runIndex: number, time: number, values: {[key: string]: number}) {
-  return new MeasureValues(runIndex, new Date(time), values);
+  return new MeasureValues(runIndex, DateWrapper.fromMillis(time), values);
 }
--- a/modules/@angular/benchpress/test/reporter/multi_reporter_spec.ts
+++ b/modules/@angular/benchpress/test/reporter/multi_reporter_spec.ts
@ -6,18 +6,19 @@
 * found in the LICENSE file at https://angular.io/license
 */
-import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
+import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} 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[]) {
-    const r = ReflectiveInjector
+    var r = ReflectiveInjector
-                  .resolveAndCreate([
+                .resolveAndCreate([
-                    ids.map(id => ({provide: id, useValue: new MockReporter(id)})),
+                  ids.map(id => { return {provide: id, useValue: new MockReporter(id)}; }),
-                    MultiReporter.provideWith(ids)
+                  MultiReporter.provideWith(ids)
-                  ])
+                ])
-                  .get(MultiReporter);
+                .get(MultiReporter);
    return Promise.resolve(r);
  }
@ -25,7 +26,7 @@ export function main() {
    it('should reportMeasureValues to all',
       inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
-         const mv = new MeasureValues(0, new Date(), {});
+         var mv = new MeasureValues(0, DateWrapper.now(), {});
         createReporters(['m1', 'm2']).then((r) => r.reportMeasureValues(mv)).then((values) => {
           expect(values).toEqual([{'id': 'm1', 'values': mv}, {'id': 'm2', 'values': mv}]);
@ -34,9 +35,10 @@ export function main() {
       }));
    it('should reportSample to call', inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
-         const completeSample =
+         var completeSample = [
-             [new MeasureValues(0, new Date(), {}), new MeasureValues(1, new Date(), {})];
+           new MeasureValues(0, DateWrapper.now(), {}), new MeasureValues(1, DateWrapper.now(), {})
-         const validSample = [completeSample[1]];
+         ];
         var validSample = [completeSample[1]];
         createReporters(['m1', 'm2'])
             .then((r) => r.reportSample(completeSample, validSample))
--- a/modules/@angular/benchpress/test/runner_spec.ts
+++ b/modules/@angular/benchpress/test/runner_spec.ts
@ -6,17 +6,18 @@
 * found in the LICENSE file at https://angular.io/license
 */
-import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
+import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} 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', () => {
-    let injector: ReflectiveInjector;
+    var injector: ReflectiveInjector;
-    let runner: Runner;
+    var runner: Runner;
    function createRunner(defaultProviders: any[] = null): Runner {
-      if (!defaultProviders) {
+      if (isBlank(defaultProviders)) {
        defaultProviders = [];
      }
      runner = new Runner([
@ -76,7 +77,7 @@ export function main() {
    it('should provide Options.EXECUTE',
       inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
-         const execute = () => {};
+         var execute = () => {};
         createRunner().sample({id: 'someId', execute: execute}).then((_) => {
           expect(injector.get(Options.EXECUTE)).toEqual(execute);
           async.done();
@ -85,7 +86,7 @@ export function main() {
    it('should provide Options.PREPARE',
       inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
-         const prepare = () => {};
+         var prepare = () => {};
         createRunner().sample({id: 'someId', prepare: prepare}).then((_) => {
           expect(injector.get(Options.PREPARE)).toEqual(prepare);
           async.done();
--- a/modules/@angular/benchpress/test/sampler_spec.ts
+++ b/modules/@angular/benchpress/test/sampler_spec.ts
@ -6,16 +6,16 @@
 * found in the LICENSE file at https://angular.io/license
 */
-import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
+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 {isBlank, isPresent} from '../src/facade/lang';
+import {Date, DateWrapper, isBlank, isPresent, stringify} from '../src/facade/lang';
 export function main() {
-  const EMPTY_EXECUTE = () => {};
+  var EMPTY_EXECUTE = () => {};
  describe('sampler', () => {
-    let sampler: Sampler;
+    var sampler: Sampler;
    function createSampler({driver, metric, reporter, validator, prepare, execute}: {
      driver?: any,
@ -25,21 +25,21 @@ export function main() {
      prepare?: any,
      execute?: any
    } = {}) {
-      let time = 1000;
+      var time = 1000;
-      if (!metric) {
+      if (isBlank(metric)) {
        metric = new MockMetric([]);
      }
-      if (!reporter) {
+      if (isBlank(reporter)) {
        reporter = new MockReporter([]);
      }
      if (isBlank(driver)) {
        driver = new MockDriverAdapter([]);
      }
-      const providers = [
+      var providers = [
        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: () => new Date(time++)}
+        {provide: Options.NOW, useValue: () => DateWrapper.fromMillis(time++)}
      ];
      if (isPresent(prepare)) {
        providers.push({provide: Options.PREPARE, useValue: prepare});
@ -50,18 +50,18 @@ export function main() {
    it('should call the prepare and execute callbacks using WebDriverAdapter.waitFor',
       inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
-         const log: any[] = [];
+         var log: any[] = [];
-         let count = 0;
+         var count = 0;
-         const driver = new MockDriverAdapter([], (callback: Function) => {
+         var driver = new MockDriverAdapter([], (callback: Function) => {
-           const result = callback();
+           var result = callback();
           log.push(result);
           return Promise.resolve(result);
         });
         createSampler({
           driver: driver,
           validator: createCountingValidator(2),
-           prepare: () => count++,
+           prepare: () => { return count++; },
-           execute: () => count++,
+           execute: () => { return count++; }
         });
         sampler.sample().then((_) => {
           expect(count).toBe(4);
@ -73,8 +73,8 @@ export function main() {
    it('should call prepare, beginMeasure, execute, endMeasure for every iteration',
       inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
-         let workCount = 0;
+         var workCount = 0;
-         const log: any[] = [];
+         var log: any[] = [];
         createSampler({
           metric: createCountingMetric(log),
           validator: createCountingValidator(2),
@ -98,8 +98,8 @@ export function main() {
    it('should call execute, endMeasure for every iteration if there is no prepare callback',
       inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
-         const log: any[] = [];
+         var log: any[] = [];
-         let workCount = 0;
+         var workCount = 0;
         createSampler({
           metric: createCountingMetric(log),
           validator: createCountingValidator(2),
@ -120,14 +120,14 @@ export function main() {
    it('should only collect metrics for execute and ignore metrics from prepare',
       inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
-         let scriptTime = 0;
+         var scriptTime = 0;
-         let iterationCount = 1;
+         var iterationCount = 1;
         createSampler({
           validator: createCountingValidator(2),
           metric: new MockMetric(
               [],
               () => {
-                 const result = Promise.resolve({'script': scriptTime});
+                 var result = Promise.resolve({'script': scriptTime});
                 scriptTime = 0;
                 return result;
               }),
@ -147,8 +147,8 @@ export function main() {
    it('should call the validator for every execution and store the valid sample',
       inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
-         const log: any[] = [];
+         var log: any[] = [];
-         const validSample = [mv(null, null, {})];
+         var validSample = [mv(null, null, {})];
         createSampler({
           metric: createCountingMetric(),
@ -174,8 +174,8 @@ export function main() {
    it('should report the metric values',
       inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
-         const log: any[] = [];
+         var log: any[] = [];
-         const validSample = [mv(null, null, {})];
+         var validSample = [mv(null, null, {})];
         createSampler({
           validator: createCountingValidator(2, validSample),
           metric: createCountingMetric(),
@ -204,7 +204,7 @@ export function main() {
 }
 function mv(runIndex: number, time: number, values: {[key: string]: number}) {
-  return new MeasureValues(runIndex, new Date(time), values);
+  return new MeasureValues(runIndex, DateWrapper.fromMillis(time), values);
 }
 function createCountingValidator(
@ -212,7 +212,7 @@ function createCountingValidator(
  return new MockValidator(log, (completeSample: MeasureValues[]) => {
    count--;
    if (count === 0) {
-      return validSample || completeSample;
+      return isPresent(validSample) ? validSample : completeSample;
    } else {
      return null;
    }
@ -220,8 +220,8 @@ function createCountingValidator(
 }
 function createCountingMetric(log: any[] = []) {
-  let scriptTime = 0;
+  var scriptTime = 0;
-  return new MockMetric(log, () => ({'script': scriptTime++}));
+  return new MockMetric(log, () => { return {'script': scriptTime++}; });
 }
 class MockDriverAdapter extends WebDriverAdapter {
@ -239,8 +239,7 @@ class MockDriverAdapter extends WebDriverAdapter {
 class MockValidator extends Validator {
  constructor(private _log: any[] = [], private _validate: Function = null) { super(); }
  validate(completeSample: MeasureValues[]): MeasureValues[] {
-    const stableSample =
+    var stableSample = isPresent(this._validate) ? this._validate(completeSample) : completeSample;
        isPresent(this._validate) ? this._validate(completeSample) : completeSample;
    this._log.push(['validate', completeSample, stableSample]);
    return stableSample;
  }
@ -253,7 +252,7 @@ class MockMetric extends Metric {
    return Promise.resolve(null);
  }
  endMeasure(restart: boolean) {
-    const measureValues = isPresent(this._endMeasure) ? this._endMeasure() : {};
+    var measureValues = isPresent(this._endMeasure) ? this._endMeasure() : {};
    this._log.push(['endMeasure', restart, measureValues]);
    return Promise.resolve(measureValues);
  }
--- 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 {describe, expect, it} from '@angular/core/testing/testing_internal';
+import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
 import {Statistic} from '../src/statistic';
 export function main() {
--- a/modules/@angular/benchpress/test/trace_event_factory.ts
+++ b/modules/@angular/benchpress/test/trace_event_factory.ts
@ -13,7 +13,7 @@ export class TraceEventFactory {
  constructor(private _cat: string, private _pid: string) {}
  create(ph: any, name: string, time: number, args: any = null) {
-    const res:
+    var res:
        PerfLogEvent = {'name': name, 'cat': this._cat, 'ph': ph, 'ts': time, 'pid': this._pid};
    if (isPresent(args)) {
      res['args'] = args;
@ -34,7 +34,7 @@ export class TraceEventFactory {
  }
  complete(name: string, time: number, duration: number, args: any = null) {
-    const res = this.create('X', name, time, args);
+    var res = this.create('X', name, time, args);
    res['dur'] = duration;
    return res;
  }
--- a/modules/@angular/benchpress/test/validator/regression_slope_validator_spec.ts
+++ b/modules/@angular/benchpress/test/validator/regression_slope_validator_spec.ts
@ -6,13 +6,15 @@
 * found in the LICENSE file at https://angular.io/license
 */
-import {describe, expect, it} from '@angular/core/testing/testing_internal';
+import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
 import {MeasureValues, ReflectiveInjector, RegressionSlopeValidator} from '../../index';
 import {ListWrapper} from '../../src/facade/collection';
 import {Date, DateWrapper} from '../../src/facade/lang';
 export function main() {
  describe('regression slope validator', () => {
-    let validator: RegressionSlopeValidator;
+    var validator: RegressionSlopeValidator;
    function createValidator({size, metric}: {size: number, metric: string}) {
      validator = ReflectiveInjector
@ -42,21 +44,23 @@ export function main() {
    it('should return the last sampleSize runs when the regression slope is ==0', () => {
      createValidator({size: 2, metric: 'script'});
-      const sample = [mv(0, 0, {'script': 1}), mv(1, 1, {'script': 1}), mv(2, 2, {'script': 1})];
+      var sample = [mv(0, 0, {'script': 1}), mv(1, 1, {'script': 1}), mv(2, 2, {'script': 1})];
-      expect(validator.validate(sample.slice(0, 2))).toEqual(sample.slice(0, 2));
+      expect(validator.validate(ListWrapper.slice(sample, 0, 2)))
-      expect(validator.validate(sample)).toEqual(sample.slice(1, 3));
+          .toEqual(ListWrapper.slice(sample, 0, 2));
      expect(validator.validate(sample)).toEqual(ListWrapper.slice(sample, 1, 3));
    });
    it('should return the last sampleSize runs when the regression slope is >0', () => {
      createValidator({size: 2, metric: 'script'});
-      const sample = [mv(0, 0, {'script': 1}), mv(1, 1, {'script': 2}), mv(2, 2, {'script': 3})];
+      var sample = [mv(0, 0, {'script': 1}), mv(1, 1, {'script': 2}), mv(2, 2, {'script': 3})];
-      expect(validator.validate(sample.slice(0, 2))).toEqual(sample.slice(0, 2));
+      expect(validator.validate(ListWrapper.slice(sample, 0, 2)))
-      expect(validator.validate(sample)).toEqual(sample.slice(1, 3));
+          .toEqual(ListWrapper.slice(sample, 0, 2));
      expect(validator.validate(sample)).toEqual(ListWrapper.slice(sample, 1, 3));
    });
  });
 }
 function mv(runIndex: number, time: number, values: {[key: string]: number}) {
-  return new MeasureValues(runIndex, new Date(time), values);
+  return new MeasureValues(runIndex, DateWrapper.fromMillis(time), values);
 }
--- a/modules/@angular/benchpress/test/validator/size_validator_spec.ts
+++ b/modules/@angular/benchpress/test/validator/size_validator_spec.ts
@ -6,13 +6,15 @@
 * found in the LICENSE file at https://angular.io/license
 */
-import {describe, expect, it} from '@angular/core/testing/testing_internal';
+import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
-import {MeasureValues, ReflectiveInjector, SizeValidator} from '../../index';
+import {MeasureValues, ReflectiveInjector, SizeValidator, Validator} from '../../index';
 import {ListWrapper} from '../../src/facade/collection';
 import {Date, DateWrapper} from '../../src/facade/lang';
 export function main() {
  describe('size validator', () => {
-    let validator: SizeValidator;
+    var validator: SizeValidator;
    function createValidator(size: number) {
      validator =
@ -35,14 +37,15 @@ export function main() {
    it('should return the last sampleSize runs when it has at least the given size', () => {
      createValidator(2);
-      const sample = [mv(0, 0, {'a': 1}), mv(1, 1, {'b': 2}), mv(2, 2, {'c': 3})];
+      var sample = [mv(0, 0, {'a': 1}), mv(1, 1, {'b': 2}), mv(2, 2, {'c': 3})];
-      expect(validator.validate(sample.slice(0, 2))).toEqual(sample.slice(0, 2));
+      expect(validator.validate(ListWrapper.slice(sample, 0, 2)))
-      expect(validator.validate(sample)).toEqual(sample.slice(1, 3));
+          .toEqual(ListWrapper.slice(sample, 0, 2));
      expect(validator.validate(sample)).toEqual(ListWrapper.slice(sample, 1, 3));
    });
  });
 }
 function mv(runIndex: number, time: number, values: {[key: string]: number}) {
-  return new MeasureValues(runIndex, new Date(time), values);
+  return new MeasureValues(runIndex, DateWrapper.fromMillis(time), values);
 }
--- a/modules/@angular/benchpress/test/web_driver_extension_spec.ts
+++ b/modules/@angular/benchpress/test/web_driver_extension_spec.ts
@ -6,10 +6,10 @@
 * found in the LICENSE file at https://angular.io/license
 */
-import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
+import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
 import {Options, ReflectiveInjector, WebDriverExtension} from '../index';
-import {isPresent} from '../src/facade/lang';
+import {StringWrapper, isPresent} from '../src/facade/lang';
 export function main() {
  function createExtension(ids: any[], caps: any) {
@ -17,7 +17,7 @@ export function main() {
      try {
        res(ReflectiveInjector
                .resolveAndCreate([
-                  ids.map((id) => ({provide: id, useValue: new MockExtension(id)})),
+                  ids.map((id) => { return {provide: id, useValue: new MockExtension(id)}; }),
                  {provide: Options.CAPABILITIES, useValue: caps},
                  WebDriverExtension.provideFirstSupported(ids)
                ])
@ -52,6 +52,6 @@ class MockExtension extends WebDriverExtension {
  constructor(public id: string) { super(); }
  supports(capabilities: {[key: string]: any}): boolean {
-    return capabilities['browser'] === this.id;
+    return StringWrapper.equals(capabilities['browser'], this.id);
  }
 }
--- a/modules/@angular/benchpress/test/webdriver/chrome_driver_extension_spec.ts
+++ b/modules/@angular/benchpress/test/webdriver/chrome_driver_extension_spec.ts
@ -6,36 +6,36 @@
 * found in the LICENSE file at https://angular.io/license
 */
-import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
+import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
 import {ChromeDriverExtension, Options, ReflectiveInjector, WebDriverAdapter, WebDriverExtension} from '../../index';
-import {isBlank} from '../../src/facade/lang';
+import {Json, isBlank} from '../../src/facade/lang';
 import {TraceEventFactory} from '../trace_event_factory';
 export function main() {
  describe('chrome driver extension', () => {
-    const CHROME45_USER_AGENT =
+    var CHROME45_USER_AGENT =
        '"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2499.0 Safari/537.36"';
-    let log: any[];
+    var log: any[];
-    let extension: ChromeDriverExtension;
+    var extension: ChromeDriverExtension;
-    const blinkEvents = new TraceEventFactory('blink.console', 'pid0');
+    var blinkEvents = new TraceEventFactory('blink.console', 'pid0');
-    const v8Events = new TraceEventFactory('v8', 'pid0');
+    var v8Events = new TraceEventFactory('v8', 'pid0');
-    const v8EventsOtherProcess = new TraceEventFactory('v8', 'pid1');
+    var v8EventsOtherProcess = new TraceEventFactory('v8', 'pid1');
-    const chromeTimelineEvents =
+    var chromeTimelineEvents =
        new TraceEventFactory('disabled-by-default-devtools.timeline', 'pid0');
-    const chrome45TimelineEvents = new TraceEventFactory('devtools.timeline', 'pid0');
+    var chrome45TimelineEvents = new TraceEventFactory('devtools.timeline', 'pid0');
-    const chromeTimelineV8Events = new TraceEventFactory('devtools.timeline,v8', 'pid0');
+    var chromeTimelineV8Events = new TraceEventFactory('devtools.timeline,v8', 'pid0');
-    const chromeBlinkTimelineEvents = new TraceEventFactory('blink,devtools.timeline', 'pid0');
+    var chromeBlinkTimelineEvents = new TraceEventFactory('blink,devtools.timeline', 'pid0');
-    const chromeBlinkUserTimingEvents = new TraceEventFactory('blink.user_timing', 'pid0');
+    var chromeBlinkUserTimingEvents = new TraceEventFactory('blink.user_timing', 'pid0');
-    const benchmarkEvents = new TraceEventFactory('benchmark', 'pid0');
+    var benchmarkEvents = new TraceEventFactory('benchmark', 'pid0');
-    const normEvents = new TraceEventFactory('timeline', 'pid0');
+    var normEvents = new TraceEventFactory('timeline', 'pid0');
    function createExtension(
        perfRecords: any[] = null, userAgent: string = null,
        messageMethod = 'Tracing.dataCollected'): WebDriverExtension {
-      if (!perfRecords) {
+      if (isBlank(perfRecords)) {
        perfRecords = [];
      }
      if (isBlank(userAgent)) {
@ -101,7 +101,7 @@ export function main() {
    it('should normalize "tdur" to "dur"',
       inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
-         const event: any = chromeTimelineV8Events.create('X', 'FunctionCall', 1100, null);
+         var event: any = chromeTimelineV8Events.create('X', 'FunctionCall', 1100, null);
         event['tdur'] = 5500;
         createExtension([event]).readPerfLog().then((events) => {
           expect(events).toEqual([
@ -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(
+      return Promise.resolve(this._events.map((event) => {
-          (event) => ({
+        return {
-            'message': JSON.stringify(
+          'message': Json.stringify({'message': {'method': this._messageMethod, 'params': event}})
-                {'message': {'method': this._messageMethod, 'params': event}}, null, 2)
+        };
-          })));
+      }));
    } else {
      return null;
    }
--- a/modules/@angular/benchpress/test/webdriver/ios_driver_extension_spec.ts
+++ b/modules/@angular/benchpress/test/webdriver/ios_driver_extension_spec.ts
@ -6,20 +6,21 @@
 * found in the LICENSE file at https://angular.io/license
 */
-import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
+import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
 import {IOsDriverExtension, ReflectiveInjector, WebDriverAdapter, WebDriverExtension} from '../../index';
 import {Json, isBlank, isPresent} from '../../src/facade/lang';
 import {TraceEventFactory} from '../trace_event_factory';
 export function main() {
  describe('ios driver extension', () => {
-    let log: any[];
+    var log: any[];
-    let extension: IOsDriverExtension;
+    var extension: IOsDriverExtension;
-    const normEvents = new TraceEventFactory('timeline', 'pid0');
+    var normEvents = new TraceEventFactory('timeline', 'pid0');
    function createExtension(perfRecords: any[] = null): WebDriverExtension {
-      if (!perfRecords) {
+      if (isBlank(perfRecords)) {
        perfRecords = [];
      }
      log = [];
@ -155,7 +156,7 @@ function timeEndRecord(name: string, time: number) {
 }
 function durationRecord(type: string, startTime: number, endTime: number, children: any[] = null) {
-  if (!children) {
+  if (isBlank(children)) {
    children = [];
  }
  return {'type': type, 'startTime': startTime, 'endTime': endTime, 'children': children};
@ -183,9 +184,8 @@ class MockDriverAdapter extends WebDriverAdapter {
    if (type === 'performance') {
      return Promise.resolve(this._perfRecords.map(function(record) {
        return {
-          'message': JSON.stringify(
+          'message': Json.stringify(
-              {'message': {'method': 'Timeline.eventRecorded', 'params': {'record': record}}}, null,
+              {'message': {'method': 'Timeline.eventRecorded', 'params': {'record': record}}})
              2)
        };
      }));
    } else {
--- a/modules/@angular/common/rollup-testing.config.js
+++ b/modules/@angular/common/rollup-testing.config.js
@ -1,10 +1,3 @@
 /**
 * @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',
@ -17,4 +10,4 @@ export default {
    'rxjs/Observable': 'Rx',
    'rxjs/Subject': 'Rx'
  }
-};
+}
--- a/modules/@angular/common/rollup.config.js
+++ b/modules/@angular/common/rollup.config.js
@ -1,10 +1,3 @@
 /**
 * @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',
@ -14,6 +7,6 @@ export default {
  globals: {
    '@angular/core': 'ng.core',
    'rxjs/Observable': 'Rx',
-    'rxjs/Subject': 'Rx',
+    'rxjs/Subject': 'Rx'
  }
-};
+}
--- a/modules/@angular/common/src/directives/ng_class.ts
+++ b/modules/@angular/common/src/directives/ng_class.ts
@ -9,7 +9,9 @@
 import {CollectionChangeRecord, Directive, DoCheck, ElementRef, Input, IterableDiffer, IterableDiffers, KeyValueChangeRecord, KeyValueDiffer, KeyValueDiffers, Renderer} from '@angular/core';
 import {isListLikeIterable} from '../facade/collection';
-import {isPresent, stringify} from '../facade/lang';
+import {isPresent} from '../facade/lang';
 /**
 * @ngModule CommonModule
@ -29,11 +31,11 @@ import {isPresent, stringify} from '../facade/lang';
 *
 * @description
 *
- * The CSS classes are updated as follows, depending on the type of the expression evaluation:
+ * The CSS classes are updated as follow depending on the type of the expression evaluation:
- * - `string` - the CSS classes listed in the string (space delimited) are added,
+ * - `string` - the CSS classes listed in a string (space delimited) are added,
- * - `Array` - the CSS classes declared as Array elements are added,
+ * - `Array` - the CSS classes (Array elements) are added,
- * - `Object` - keys are CSS classes that get added when the expression given in the value
+ * - `Object` - keys are CSS class names that get added when the expression given in the value
- *              evaluates to a truthy value, otherwise they are removed.
+ *              evaluates to a truthy value, otherwise class are removed.
 *
 * @stable
 */
@ -48,6 +50,7 @@ export class NgClass implements DoCheck {
      private _iterableDiffers: IterableDiffers, private _keyValueDiffers: KeyValueDiffers,
      private _ngEl: ElementRef, private _renderer: Renderer) {}
  @Input('class')
  set klass(v: string) {
    this._applyInitialClasses(true);
@ -108,14 +111,8 @@ export class NgClass implements DoCheck {
  }
  private _applyIterableChanges(changes: any): void {
-    changes.forEachAddedItem((record: CollectionChangeRecord) => {
+    changes.forEachAddedItem(
-      if (typeof record.item === 'string') {
+        (record: CollectionChangeRecord) => this._toggleClass(record.item, true));
        this._toggleClass(record.item, true);
      } else {
        throw new Error(
            `NgClass can only toggle CSS classes expressed as strings, got ${stringify(record.item)}`);
      }
    });
    changes.forEachRemovedItem(
        (record: CollectionChangeRecord) => this._toggleClass(record.item, false));
--- a/modules/@angular/common/src/directives/ng_for.ts
+++ b/modules/@angular/common/src/directives/ng_for.ts
@ -150,13 +150,13 @@ export class NgFor implements DoCheck, OnChanges {
    }
    for (let i = 0, ilen = this._viewContainer.length; i < ilen; i++) {
-      const viewRef = <EmbeddedViewRef<NgForRow>>this._viewContainer.get(i);
+      let viewRef = <EmbeddedViewRef<NgForRow>>this._viewContainer.get(i);
      viewRef.context.index = i;
      viewRef.context.count = ilen;
    }
    changes.forEachIdentityChange((record: any) => {
-      const viewRef = <EmbeddedViewRef<NgForRow>>this._viewContainer.get(record.currentIndex);
+      let viewRef = <EmbeddedViewRef<NgForRow>>this._viewContainer.get(record.currentIndex);
      viewRef.context.$implicit = record.item;
    });
  }
--- a/modules/@angular/common/src/directives/ng_if.ts
+++ b/modules/@angular/common/src/directives/ng_if.ts
@ -11,14 +11,14 @@ import {Directive, Input, TemplateRef, ViewContainerRef} from '@angular/core';
 /**
 * Removes or recreates a portion of the DOM tree based on an {expression}.
 *
- * If the expression assigned to `ngIf` evaluates to a falsy value then the element
+ * If the expression assigned to `ngIf` evaluates to a false value then the element
 * is removed from the DOM, otherwise a clone of the element is reinserted into the DOM.
 *
 * ### Example ([live demo](http://plnkr.co/edit/fe0kgemFBtmQOY31b4tw?p=preview)):
 *
 * ```
 * <div *ngIf="errorCount > 0" class="error">
- *   <!-- Error message displayed when the errorCount property in the current context is greater
+ *   <!-- Error message displayed when the errorCount property on the current context is greater
 * than 0. -->
 *   {{errorCount}} errors detected
 * </div>
@ -34,7 +34,7 @@ import {Directive, Input, TemplateRef, ViewContainerRef} from '@angular/core';
 */
@Directive({selector: '[ngIf]'})
 export class NgIf {
-  private _hasView = false;
+  private _hasView: boolean = false;
  constructor(private _viewContainer: ViewContainerRef, private _template: TemplateRef<Object>) {}
--- a/modules/@angular/common/src/directives/ng_style.ts
+++ b/modules/@angular/common/src/directives/ng_style.ts
@ -25,7 +25,7 @@ import {Directive, DoCheck, ElementRef, Input, KeyValueChangeRecord, KeyValueDif
 * @description
 *
 * The styles are updated according to the value of the expression evaluation:
- * - keys are style names with an optional `.<unit>` suffix (ie 'top.px', 'font-style.em'),
+ * - keys are style names with an option `.<unit>` suffix (ie 'top.px', 'font-style.em'),
 * - values are the values assigned to those properties (expressed in the given unit).
 *
 * @stable
@ -67,7 +67,7 @@ export class NgStyle implements DoCheck {
  private _setStyle(nameAndUnit: string, value: string): void {
    const [name, unit] = nameAndUnit.split('.');
-    value = value && unit ? `${value}${unit}` : value;
+    value = value !== null && value !== void(0) && unit ? `${value}${unit}` : value;
    this._renderer.setElementStyle(this._ngEl.nativeElement, name, value);
  }
--- a/modules/@angular/common/src/directives/ng_switch.ts
+++ b/modules/@angular/common/src/directives/ng_switch.ts
@ -6,31 +6,19 @@
 * found in the LICENSE file at https://angular.io/license
 */
-import {Directive, DoCheck, Host, Input, TemplateRef, ViewContainerRef} from '@angular/core';
+import {Directive, Host, Input, TemplateRef, ViewContainerRef} from '@angular/core';
 import {ListWrapper} from '../facade/collection';
 const _CASE_DEFAULT = new Object();
 export class SwitchView {
  private _created = false;
  constructor(
      private _viewContainerRef: ViewContainerRef, private _templateRef: TemplateRef<Object>) {}
-  create(): void {
+  create(): void { this._viewContainerRef.createEmbeddedView(this._templateRef); }
    this._created = true;
    this._viewContainerRef.createEmbeddedView(this._templateRef);
  }
-  destroy(): void {
+  destroy(): void { this._viewContainerRef.clear(); }
    this._created = false;
    this._viewContainerRef.clear();
  }
  enforceState(created: boolean) {
    if (created && !this._created) {
      this.create();
    } else if (!created && this._created) {
      this.destroy();
    }
  }
 }
 /**
@ -50,7 +38,7 @@ export class SwitchView {
 *         <inner-element></inner-element>
 *         <inner-other-element></inner-other-element>
 *       </ng-container>
- *       <some-element *ngSwitchDefault>...</some-element>
+ *       <some-element *ngSwitchDefault>...</p>
 *     </container-element>
 * ```
 * @description
@ -65,7 +53,8 @@ export class SwitchView {
 * root elements.
 *
 * Elements within `NgSwitch` but outside of a `NgSwitchCase` or `NgSwitchDefault` directives will
- * be preserved at the location.
+ * be
 * preserved at the location.
 *
 * The `ngSwitchCase` directive informs the parent `NgSwitch` of which view to display when the
 * expression is evaluated.
@ -76,52 +65,87 @@ export class SwitchView {
 */
@Directive({selector: '[ngSwitch]'})
 export class NgSwitch {
-  private _defaultViews: SwitchView[];
+  private _switchValue: any;
-  private _defaultUsed = false;
+  private _useDefault: boolean = false;
-  private _caseCount = 0;
+  private _valueViews = new Map<any, SwitchView[]>();
-  private _lastCaseCheckIndex = 0;
+  private _activeViews: SwitchView[] = [];
  private _lastCasesMatched = false;
  private _ngSwitch: any;
  @Input()
-  set ngSwitch(newValue: any) {
+  set ngSwitch(value: any) {
-    this._ngSwitch = newValue;
+    // Empty the currently active ViewContainers
-    if (this._caseCount === 0) {
+    this._emptyAllActiveViews();
-      this._updateDefaultCases(true);
+
    // Add the ViewContainers matching the value (with a fallback to default)
    this._useDefault = false;
    let views = this._valueViews.get(value);
    if (!views) {
      this._useDefault = true;
      views = this._valueViews.get(_CASE_DEFAULT) || null;
    }
    this._activateViews(views);
    this._switchValue = value;
  }
  /** @internal */
-  _addCase(): number { return this._caseCount++; }
+  _onCaseValueChanged(oldCase: any, newCase: any, view: SwitchView): void {
    this._deregisterView(oldCase, view);
    this._registerView(newCase, view);
-  /** @internal */
+    if (oldCase === this._switchValue) {
-  _addDefault(view: SwitchView) {
+      view.destroy();
-    if (!this._defaultViews) {
+      ListWrapper.remove(this._activeViews, view);
-      this._defaultViews = [];
+    } else if (newCase === this._switchValue) {
-    }
+      if (this._useDefault) {
-    this._defaultViews.push(view);
+        this._useDefault = false;
-  }
+        this._emptyAllActiveViews();
  /** @internal */
  _matchCase(value: any): boolean {
    const matched = value == this._ngSwitch;
    this._lastCasesMatched = this._lastCasesMatched || matched;
    this._lastCaseCheckIndex++;
    if (this._lastCaseCheckIndex === this._caseCount) {
      this._updateDefaultCases(!this._lastCasesMatched);
      this._lastCaseCheckIndex = 0;
      this._lastCasesMatched = false;
    }
    return matched;
  }
  private _updateDefaultCases(useDefault: boolean) {
    if (this._defaultViews && useDefault !== this._defaultUsed) {
      this._defaultUsed = useDefault;
      for (let i = 0; i < this._defaultViews.length; i++) {
        const defaultView = this._defaultViews[i];
        defaultView.enforceState(useDefault);
      }
      view.create();
      this._activeViews.push(view);
    }
    // Switch to default when there is no more active ViewContainers
    if (this._activeViews.length === 0 && !this._useDefault) {
      this._useDefault = true;
      this._activateViews(this._valueViews.get(_CASE_DEFAULT));
    }
  }
  private _emptyAllActiveViews(): void {
    const activeContainers = this._activeViews;
    for (var i = 0; i < activeContainers.length; i++) {
      activeContainers[i].destroy();
    }
    this._activeViews = [];
  }
  private _activateViews(views: SwitchView[]): void {
    if (views) {
      for (var i = 0; i < views.length; i++) {
        views[i].create();
      }
      this._activeViews = views;
    }
  }
  /** @internal */
  _registerView(value: any, view: SwitchView): void {
    let views = this._valueViews.get(value);
    if (!views) {
      views = [];
      this._valueViews.set(value, views);
    }
    views.push(view);
  }
  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);
    if (views.length == 1) {
      this._valueViews.delete(value);
    } else {
      ListWrapper.remove(views, view);
    }
  }
 }
@ -151,20 +175,24 @@ export class NgSwitch {
 * @stable
 */
@Directive({selector: '[ngSwitchCase]'})
-export class NgSwitchCase implements DoCheck {
+export class NgSwitchCase {
  // `_CASE_DEFAULT` is used as a marker for a not yet initialized value
  private _value: any = _CASE_DEFAULT;
  private _view: SwitchView;
-
+  private _switch: NgSwitch;
  @Input()
  ngSwitchCase: any;
  constructor(
      viewContainer: ViewContainerRef, templateRef: TemplateRef<Object>,
-      @Host() private ngSwitch: NgSwitch) {
+      @Host() ngSwitch: NgSwitch) {
-    ngSwitch._addCase();
+    this._switch = ngSwitch;
    this._view = new SwitchView(viewContainer, templateRef);
  }
-  ngDoCheck() { this._view.enforceState(this.ngSwitch._matchCase(this.ngSwitchCase)); }
+  @Input()
  set ngSwitchCase(value: any) {
    this._switch._onCaseValueChanged(this._value, value, this._view);
    this._value = value;
  }
 }
 /**
@ -194,7 +222,7 @@ export class NgSwitchCase implements DoCheck {
 export class NgSwitchDefault {
  constructor(
      viewContainer: ViewContainerRef, templateRef: TemplateRef<Object>,
-      @Host() ngSwitch: NgSwitch) {
+      @Host() sswitch: NgSwitch) {
-    ngSwitch._addDefault(new SwitchView(viewContainer, templateRef));
+    sswitch._registerView(_CASE_DEFAULT, new SwitchView(viewContainer, templateRef));
  }
 }
--- a/modules/@angular/common/src/location/hash_location_strategy.ts
+++ b/modules/@angular/common/src/location/hash_location_strategy.ts
@ -64,19 +64,19 @@ export class HashLocationStrategy extends LocationStrategy {
  path(includeHash: boolean = false): string {
    // the hash value is always prefixed with a `#`
    // and if it is empty then it will stay empty
-    let path = this._platformLocation.hash;
+    var path = this._platformLocation.hash;
    if (!isPresent(path)) path = '#';
    return path.length > 0 ? path.substring(1) : path;
  }
  prepareExternalUrl(internal: string): string {
-    const url = Location.joinWithSlash(this._baseHref, internal);
+    var url = Location.joinWithSlash(this._baseHref, internal);
    return url.length > 0 ? ('#' + url) : url;
  }
  pushState(state: any, title: string, path: string, queryParams: string) {
-    let url = this.prepareExternalUrl(path + Location.normalizeQueryParams(queryParams));
+    var url = this.prepareExternalUrl(path + Location.normalizeQueryParams(queryParams));
    if (url.length == 0) {
      url = this._platformLocation.pathname;
    }
@ -84,7 +84,7 @@ export class HashLocationStrategy extends LocationStrategy {
  }
  replaceState(state: any, title: string, path: string, queryParams: string) {
-    let url = this.prepareExternalUrl(path + Location.normalizeQueryParams(queryParams));
+    var url = this.prepareExternalUrl(path + Location.normalizeQueryParams(queryParams));
    if (url.length == 0) {
      url = this._platformLocation.pathname;
    }
--- a/modules/@angular/common/src/location/location.ts
+++ b/modules/@angular/common/src/location/location.ts
@ -156,7 +156,7 @@ export class Location {
    if (end.length == 0) {
      return start;
    }
-    let slashes = 0;
+    var slashes = 0;
    if (start.endsWith('/')) {
      slashes++;
    }
--- a/modules/@angular/common/src/location/path_location_strategy.ts
+++ b/modules/@angular/common/src/location/path_location_strategy.ts
@ -79,12 +79,12 @@ export class PathLocationStrategy extends LocationStrategy {
  }
  pushState(state: any, title: string, url: string, queryParams: string) {
-    const externalUrl = this.prepareExternalUrl(url + Location.normalizeQueryParams(queryParams));
+    var externalUrl = this.prepareExternalUrl(url + Location.normalizeQueryParams(queryParams));
    this._platformLocation.pushState(state, title, externalUrl);
  }
  replaceState(state: any, title: string, url: string, queryParams: string) {
-    const externalUrl = this.prepareExternalUrl(url + Location.normalizeQueryParams(queryParams));
+    var externalUrl = this.prepareExternalUrl(url + Location.normalizeQueryParams(queryParams));
    this._platformLocation.replaceState(state, title, externalUrl);
  }
--- a/modules/@angular/common/src/pipes/date_pipe.ts
+++ b/modules/@angular/common/src/pipes/date_pipe.ts
@ -8,7 +8,7 @@
 import {Inject, LOCALE_ID, Pipe, PipeTransform} from '@angular/core';
 import {DateFormatter} from '../facade/intl';
-import {NumberWrapper, isDate} from '../facade/lang';
+import {NumberWrapper, isBlank, isDate} from '../facade/lang';
 import {InvalidPipeArgumentError} from './invalid_pipe_argument_error';
@ -33,30 +33,27 @@ import {InvalidPipeArgumentError} from './invalid_pipe_argument_error';
 *   - `'shortTime'`: equivalent to `'jm'` (e.g. `12:05 PM` for `en-US`)
 *
 *
- *  | Component | Symbol | Narrow | Short Form   | Long Form         | Numeric   | 2-digit   |
+ *  | Component | Symbol | Short Form   | Long Form         | Numeric   | 2-digit   |
- *  |-----------|:------:|--------|--------------|-------------------|-----------|-----------|
+ *  |-----------|:------:|--------------|-------------------|-----------|-----------|
- *  | era       |   G    | G (A)  | GGG (AD)     | GGGG (Anno Domini)| -         | -         |
+ *  | era       |   G    | G (AD)       | GGGG (Anno Domini)| -         | -         |
- *  | year      |   y    | -      | -            | -                 | y (2015)  | yy (15)   |
+ *  | year      |   y    | -            | -                 | y (2015)  | yy (15)   |
- *  | month     |   M    | L (S)  | MMM (Sep)    | MMMM (September)  | M (9)     | MM (09)   |
+ *  | month     |   M    | MMM (Sep)    | MMMM (September)  | M (9)     | MM (09)   |
- *  | day       |   d    | -      | -            | -                 | d (3)     | dd (03)   |
+ *  | day       |   d    | -            | -                 | d (3)     | dd (03)   |
- *  | weekday   |   E    | E (S)  | EEE (Sun)    | EEEE (Sunday)     | -         | -         |
+ *  | weekday   |   E    | EEE (Sun)    | EEEE (Sunday)     | -         | -         |
- *  | hour      |   j    | -      | -            | -                 | j (13)    | jj (13)   |
+ *  | hour      |   j    | -            | -                 | j (13)    | jj (13)   |
- *  | hour12    |   h    | -      | -            | -                 | h (1 PM)  | hh (01 PM)|
+ *  | hour12    |   h    | -            | -                 | h (1 PM)  | hh (01 PM)|
- *  | hour24    |   H    | -      | -            | -                 | H (13)    | HH (13)   |
+ *  | hour24    |   H    | -            | -                 | H (13)    | HH (13)   |
- *  | minute    |   m    | -      | -            | -                 | m (5)     | mm (05)   |
+ *  | minute    |   m    | -            | -                 | m (5)     | mm (05)   |
- *  | second    |   s    | -      | -            | -                 | s (9)     | ss (09)   |
+ *  | second    |   s    | -            | -                 | s (9)     | ss (09)   |
- *  | timezone  |   z    | -      | -            | z (Pacific Standard Time)| -  | -         |
+ *  | timezone  |   z    | -            | z (Pacific Standard Time)| -  | -         |
- *  | timezone  |   Z    | -      | Z (GMT-8:00) | -                 | -         | -         |
+ *  | timezone  |   Z    | Z (GMT-8:00) | -                 | -         | -         |
- *  | timezone  |   a    | -      | a (PM)       | -                 | -         | -         |
+ *  | timezone  |   a    | a (PM)       | -                 | -         | -         |
 *
 * In javascript, only the components specified will be respected (not the ordering,
 * punctuations, ...) and details of the formatting will be dependent on the locale.
 *
 * Timezone of the formatted text will be the local system timezone of the end-user's machine.
 *
 * When the expression is a ISO string without time (e.g. 2016-09-19) the time zone offset is not
 * applied and the formatted text will have the same day, month and year of the expression.
 *
 * WARNINGS:
 * - this pipe is marked as pure hence it will not be re-evaluated when the input is mutated.
 *   Instead users should treat the date as an immutable object and change the reference when the
@ -98,42 +95,22 @@ export class DatePipe implements PipeTransform {
  constructor(@Inject(LOCALE_ID) private _locale: string) {}
  transform(value: any, pattern: string = 'mediumDate'): string {
    let date: Date;
    if (isBlank(value)) return null;
-    if (typeof value === 'string') {
+    if (!this.supports(value)) {
      value = value.trim();
    }
    if (isDate(value)) {
      date = value;
    } else if (NumberWrapper.isNumeric(value)) {
      date = new Date(parseFloat(value));
    } else if (typeof value === 'string' && /^(\d{4}-\d{1,2}-\d{1,2})$/.test(value)) {
      /**
      * For ISO Strings without time the day, month and year must be extracted from the ISO String
      * before Date creation to avoid time offset and errors in the new Date.
      * If we only replace '-' with ',' in the ISO String ("2015,01,01"), and try to create a new
      * date, some browsers (e.g. IE 9) will throw an invalid Date error
      * If we leave the '-' ("2015-01-01") and try to create a new Date("2015-01-01") the timeoffset
      * is applied
      * Note: ISO months are 0 for January, 1 for February, ...
      */
      const [y, m, d] = value.split('-').map((val: string) => parseInt(val, 10));
      date = new Date(y, m - 1, d);
    } else {
      date = new Date(value);
    }
    if (!isDate(date)) {
      throw new InvalidPipeArgumentError(DatePipe, value);
    }
-    return DateFormatter.format(date, this._locale, DatePipe._ALIASES[pattern] || pattern);
+    if (NumberWrapper.isNumeric(value)) {
      value = parseFloat(value);
    }
    return DateFormatter.format(
        new Date(value), this._locale, DatePipe._ALIASES[pattern] || pattern);
  }
  private supports(obj: any): boolean {
    return isDate(obj) || NumberWrapper.isNumeric(obj) ||
        (typeof obj === 'string' && isDate(new Date(obj)));
  }
 }
 function isBlank(obj: any): boolean {
  return obj == null || obj === '';
 }
--- a/modules/@angular/common/src/pipes/i18n_plural_pipe.ts
+++ b/modules/@angular/common/src/pipes/i18n_plural_pipe.ts
@ -7,7 +7,7 @@
 */
 import {Pipe, PipeTransform} from '@angular/core';
-import {isBlank} from '../facade/lang';
+import {isBlank, isStringMap} from '../facade/lang';
 import {NgLocalization, getPluralCategory} from '../localization';
 import {InvalidPipeArgumentError} from './invalid_pipe_argument_error';
@ -37,7 +37,7 @@ export class I18nPluralPipe implements PipeTransform {
  transform(value: number, pluralMap: {[count: string]: string}): string {
    if (isBlank(value)) return '';
-    if (typeof pluralMap !== 'object' || pluralMap === null) {
+    if (!isStringMap(pluralMap)) {
      throw new InvalidPipeArgumentError(I18nPluralPipe, pluralMap);
    }
--- a/modules/@angular/common/src/pipes/i18n_select_pipe.ts
+++ b/modules/@angular/common/src/pipes/i18n_select_pipe.ts
@ -7,6 +7,7 @@
 */
 import {Pipe, PipeTransform} from '@angular/core';
 import {isBlank, isStringMap} from '../facade/lang';
 import {InvalidPipeArgumentError} from './invalid_pipe_argument_error';
 /**
@ -15,10 +16,9 @@ import {InvalidPipeArgumentError} from './invalid_pipe_argument_error';
 * @howToUse `expression | i18nSelect:mapping`
 * @description
 *
- *  Where `mapping` is an object that indicates the text that should be displayed
+ *  Where:
 *  - `mapping`: is an object that indicates the text that should be displayed
 *  for different values of the provided `expression`.
 *  If none of the keys of the mapping match the value of the `expression`, then the content
 *  of the `other` key is returned when present, otherwise an empty string is returned.
 *
 *  ## Example
 *
@ -29,20 +29,12 @@ import {InvalidPipeArgumentError} from './invalid_pipe_argument_error';
@Pipe({name: 'i18nSelect', pure: true})
 export class I18nSelectPipe implements PipeTransform {
  transform(value: string, mapping: {[key: string]: string}): string {
-    if (value == null) return '';
+    if (isBlank(value)) return '';
-    if (typeof mapping !== 'object' || typeof value !== 'string') {
+    if (!isStringMap(mapping)) {
      throw new InvalidPipeArgumentError(I18nSelectPipe, mapping);
    }
-    if (mapping.hasOwnProperty(value)) {
+    return mapping.hasOwnProperty(value) ? mapping[value] : '';
      return mapping[value];
    }
    if (mapping.hasOwnProperty('other')) {
      return mapping['other'];
    }
    return '';
  }
 }
--- a/modules/@angular/common/src/pipes/json_pipe.ts
+++ b/modules/@angular/common/src/pipes/json_pipe.ts
@ -8,6 +8,10 @@
 import {Pipe, PipeTransform} from '@angular/core';
 import {Json} from '../facade/lang';
 /**
 * @ngModule CommonModule
 * @whatItDoes Converts value into JSON string.
@ -23,5 +27,5 @@ import {Pipe, PipeTransform} from '@angular/core';
 */
@Pipe({name: 'json', pure: false})
 export class JsonPipe implements PipeTransform {
-  transform(value: any): string { return JSON.stringify(value, null, 2); }
+  transform(value: any): string { return Json.stringify(value); }
 }
--- a/modules/@angular/common/src/pipes/lowercase_pipe.ts
+++ b/modules/@angular/common/src/pipes/lowercase_pipe.ts
@ -17,7 +17,7 @@ import {InvalidPipeArgumentError} from './invalid_pipe_argument_error';
 * @howToUse `expression | lowercase`
 * @description
 *
- * Converts value into a lowercase string using `String.prototype.toLowerCase()`.
+ * Converts value into lowercase string using `String.prototype.toLowerCase()`.
 *
 * ### Example
 *
--- a/modules/@angular/common/src/pipes/number_pipe.ts
+++ b/modules/@angular/common/src/pipes/number_pipe.ts
@ -37,7 +37,7 @@ function formatNumber(
  }
  if (digits) {
-    const parts = digits.match(_NUMBER_FORMAT_REGEXP);
+    let parts = digits.match(_NUMBER_FORMAT_REGEXP);
    if (parts === null) {
      throw new Error(`${digits} is not a valid digit info for number pipes`);
    }
--- a/modules/@angular/common/src/pipes/uppercase_pipe.ts
+++ b/modules/@angular/common/src/pipes/uppercase_pipe.ts
@ -16,7 +16,7 @@ import {InvalidPipeArgumentError} from './invalid_pipe_argument_error';
 * @howToUse `expression | uppercase`
 * @description
 *
- * Converts value into an uppercase string using `String.prototype.toUpperCase()`.
+ * Converts value into lowercase string using `String.prototype.toUpperCase()`.
 *
 * ### Example
 *
--- a/modules/@angular/common/test/directives/ng_class_spec.ts
+++ b/modules/@angular/common/test/directives/ng_class_spec.ts
@ -8,6 +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';
 export function main() {
  describe('binding to CSS class list', () => {
@ -65,7 +66,7 @@ export function main() {
      it('should add and remove classes based on changes to the expression object', async(() => {
           fixture = createTestComponent('<div [ngClass]="objExpr"></div>');
-           const objExpr = getComponent().objExpr;
+           let objExpr = getComponent().objExpr;
           detectChangesAndExpectClassName('foo');
@ -134,7 +135,7 @@ export function main() {
      it('should add and remove classes based on changes to the expression', async(() => {
           fixture = createTestComponent('<div [ngClass]="arrExpr"></div>');
-           const arrExpr = getComponent().arrExpr;
+           let arrExpr = getComponent().arrExpr;
           detectChangesAndExpectClassName('foo');
           arrExpr.push('bar');
@ -186,13 +187,6 @@ export function main() {
           getComponent().arrExpr = ['foo bar   baz foobar'];
           detectChangesAndExpectClassName('foo bar baz foobar');
         }));
      it('should throw with descriptive error message when CSS class is not a string', () => {
        fixture = createTestComponent(`<div [ngClass]="['foo', {}]"></div>`);
        expect(() => fixture.detectChanges())
            .toThrowError(
                /NgClass can only toggle CSS classes expressed as strings, got \[object Object\]/);
      });
    });
    describe('expressions evaluating to sets', () => {
@ -259,7 +253,7 @@ export function main() {
      it('should co-operate with the class attribute', async(() => {
           fixture = createTestComponent('<div [ngClass]="objExpr" class="init foo"></div>');
-           const objExpr = getComponent().objExpr;
+           let objExpr = getComponent().objExpr;
           objExpr['bar'] = true;
           detectChangesAndExpectClassName('init foo bar');
@ -273,7 +267,7 @@ export function main() {
      it('should co-operate with the interpolated class attribute', async(() => {
           fixture = createTestComponent(`<div [ngClass]="objExpr" class="{{'init foo'}}"></div>`);
-           const objExpr = getComponent().objExpr;
+           let objExpr = getComponent().objExpr;
           objExpr['bar'] = true;
           detectChangesAndExpectClassName(`init foo bar`);
@ -288,7 +282,7 @@ export function main() {
      it('should co-operate with the class attribute and binding to it', async(() => {
           fixture =
               createTestComponent(`<div [ngClass]="objExpr" class="init" [class]="'foo'"></div>`);
-           const objExpr = getComponent().objExpr;
+           let objExpr = getComponent().objExpr;
           objExpr['bar'] = true;
           detectChangesAndExpectClassName(`init foo bar`);
@ -304,7 +298,7 @@ export function main() {
           const template =
               '<div class="init foo" [ngClass]="objExpr" [class.baz]="condition"></div>';
           fixture = createTestComponent(template);
-           const objExpr = getComponent().objExpr;
+           let objExpr = getComponent().objExpr;
           detectChangesAndExpectClassName('init foo baz');
@ -322,7 +316,7 @@ export function main() {
         async(() => {
           const template = '<div class="init" [ngClass]="objExpr" [class]="strExpr"></div>';
           fixture = createTestComponent(template);
-           const cmp = getComponent();
+           let cmp = getComponent();
           detectChangesAndExpectClassName('init foo');
@ -354,4 +348,4 @@ class TestComponent {
 function createTestComponent(template: string): ComponentFixture<TestComponent> {
  return TestBed.overrideComponent(TestComponent, {set: {template: template}})
      .createComponent(TestComponent);
-}
+}
--- a/modules/@angular/common/test/directives/ng_for_spec.ts
+++ b/modules/@angular/common/test/directives/ng_for_spec.ts
@ -264,7 +264,7 @@ export function main() {
       }));
    it('should use a default template if a custom one is null', async(() => {
-         const testTemplate = `<ul><template ngFor let-item [ngForOf]="items"
+         const testTemplate = `<ul><template ngFor let-item [ngForOf]="items" 
            [ngForTemplate]="contentTpl" let-i="index">{{i}}: {{item}};</template></ul>`;
         TestBed.overrideComponent(TestComponent, {set: {template: testTemplate}});
         const cutTemplate =
--- a/modules/@angular/common/test/directives/ng_switch_spec.ts
+++ b/modules/@angular/common/test/directives/ng_switch_spec.ts
@ -7,8 +7,8 @@
 */
 import {CommonModule} from '@angular/common';
-import {Attribute, Component, Directive} from '@angular/core';
+import {Component} from '@angular/core';
-import {ComponentFixture, TestBed} from '@angular/core/testing';
+import {ComponentFixture, TestBed, async} from '@angular/core/testing';
 import {expect} from '@angular/platform-browser/testing/matchers';
 export function main() {
@ -32,153 +32,109 @@ export function main() {
    });
    describe('switch value changes', () => {
-      it('should switch amongst when values', () => {
+      it('should switch amongst when values', async(() => {
-        const template = '<div>' +
+           const template = '<div>' +
-            '<ul [ngSwitch]="switchValue">' +
+               '<ul [ngSwitch]="switchValue">' +
-            '<template ngSwitchCase="a"><li>when a</li></template>' +
+               '<template ngSwitchCase="a"><li>when a</li></template>' +
-            '<template ngSwitchCase="b"><li>when b</li></template>' +
+               '<template ngSwitchCase="b"><li>when b</li></template>' +
-            '</ul></div>';
+               '</ul></div>';
-        fixture = createTestComponent(template);
+           fixture = createTestComponent(template);
-        detectChangesAndExpectText('');
+           detectChangesAndExpectText('');
-        getComponent().switchValue = 'a';
+           getComponent().switchValue = 'a';
-        detectChangesAndExpectText('when a');
+           detectChangesAndExpectText('when a');
-        getComponent().switchValue = 'b';
+           getComponent().switchValue = 'b';
-        detectChangesAndExpectText('when b');
+           detectChangesAndExpectText('when b');
-      });
+         }));
-      it('should switch amongst when values with fallback to default', () => {
+      // TODO(robwormald): deprecate and remove
-        const template = '<div>' +
+      it('should switch amongst when values using switchCase', async(() => {
-            '<ul [ngSwitch]="switchValue">' +
+           const template = '<div>' +
-            '<li template="ngSwitchCase \'a\'">when a</li>' +
+               '<ul [ngSwitch]="switchValue">' +
-            '<li template="ngSwitchDefault">when default</li>' +
+               '<template ngSwitchCase="a"><li>when a</li></template>' +
-            '</ul></div>';
+               '<template ngSwitchCase="b"><li>when b</li></template>' +
               '</ul></div>';
-        fixture = createTestComponent(template);
+           fixture = createTestComponent(template);
        detectChangesAndExpectText('when default');
-        getComponent().switchValue = 'a';
+           detectChangesAndExpectText('');
        detectChangesAndExpectText('when a');
-        getComponent().switchValue = 'b';
+           getComponent().switchValue = 'a';
-        detectChangesAndExpectText('when default');
+           detectChangesAndExpectText('when a');
-        getComponent().switchValue = 'c';
+           getComponent().switchValue = 'b';
-        detectChangesAndExpectText('when default');
+           detectChangesAndExpectText('when b');
-      });
+         }));
-      it('should support multiple whens with the same value', () => {
+      it('should switch amongst when values with fallback to default', async(() => {
-        const template = '<div>' +
+           const template = '<div>' +
-            '<ul [ngSwitch]="switchValue">' +
+               '<ul [ngSwitch]="switchValue">' +
-            '<template ngSwitchCase="a"><li>when a1;</li></template>' +
+               '<li template="ngSwitchCase \'a\'">when a</li>' +
-            '<template ngSwitchCase="b"><li>when b1;</li></template>' +
+               '<li template="ngSwitchDefault">when default</li>' +
-            '<template ngSwitchCase="a"><li>when a2;</li></template>' +
+               '</ul></div>';
            '<template ngSwitchCase="b"><li>when b2;</li></template>' +
            '<template ngSwitchDefault><li>when default1;</li></template>' +
            '<template ngSwitchDefault><li>when default2;</li></template>' +
            '</ul></div>';
-        fixture = createTestComponent(template);
+           fixture = createTestComponent(template);
-        detectChangesAndExpectText('when default1;when default2;');
+           detectChangesAndExpectText('when default');
-        getComponent().switchValue = 'a';
+           getComponent().switchValue = 'a';
-        detectChangesAndExpectText('when a1;when a2;');
+           detectChangesAndExpectText('when a');
-        getComponent().switchValue = 'b';
+           getComponent().switchValue = 'b';
-        detectChangesAndExpectText('when b1;when b2;');
+           detectChangesAndExpectText('when default');
-      });
+         }));
      it('should support multiple whens with the same value', async(() => {
           const template = '<div>' +
               '<ul [ngSwitch]="switchValue">' +
               '<template ngSwitchCase="a"><li>when a1;</li></template>' +
               '<template ngSwitchCase="b"><li>when b1;</li></template>' +
               '<template ngSwitchCase="a"><li>when a2;</li></template>' +
               '<template ngSwitchCase="b"><li>when b2;</li></template>' +
               '<template ngSwitchDefault><li>when default1;</li></template>' +
               '<template ngSwitchDefault><li>when default2;</li></template>' +
               '</ul></div>';
           fixture = createTestComponent(template);
           detectChangesAndExpectText('when default1;when default2;');
           getComponent().switchValue = 'a';
           detectChangesAndExpectText('when a1;when a2;');
           getComponent().switchValue = 'b';
           detectChangesAndExpectText('when b1;when b2;');
         }));
    });
    describe('when values changes', () => {
-      it('should switch amongst when values', () => {
+      it('should switch amongst when values', async(() => {
-        const template = '<div>' +
+           const template = '<div>' +
-            '<ul [ngSwitch]="switchValue">' +
+               '<ul [ngSwitch]="switchValue">' +
-            '<template [ngSwitchCase]="when1"><li>when 1;</li></template>' +
+               '<template [ngSwitchCase]="when1"><li>when 1;</li></template>' +
-            '<template [ngSwitchCase]="when2"><li>when 2;</li></template>' +
+               '<template [ngSwitchCase]="when2"><li>when 2;</li></template>' +
-            '<template ngSwitchDefault><li>when default;</li></template>' +
+               '<template ngSwitchDefault><li>when default;</li></template>' +
-            '</ul></div>';
+               '</ul></div>';
-        fixture = createTestComponent(template);
+           fixture = createTestComponent(template);
-        getComponent().when1 = 'a';
+           getComponent().when1 = 'a';
-        getComponent().when2 = 'b';
+           getComponent().when2 = 'b';
-        getComponent().switchValue = 'a';
+           getComponent().switchValue = 'a';
-        detectChangesAndExpectText('when 1;');
+           detectChangesAndExpectText('when 1;');
-        getComponent().switchValue = 'b';
+           getComponent().switchValue = 'b';
-        detectChangesAndExpectText('when 2;');
+           detectChangesAndExpectText('when 2;');
-        getComponent().switchValue = 'c';
+           getComponent().switchValue = 'c';
-        detectChangesAndExpectText('when default;');
+           detectChangesAndExpectText('when default;');
-        getComponent().when1 = 'c';
+           getComponent().when1 = 'c';
-        detectChangesAndExpectText('when 1;');
+           detectChangesAndExpectText('when 1;');
-        getComponent().when1 = 'd';
+           getComponent().when1 = 'd';
-        detectChangesAndExpectText('when default;');
+           detectChangesAndExpectText('when default;');
-      });
+         }));
    });
    describe('corner cases', () => {
      it('should not create the default case if another case matches', () => {
        const log: string[] = [];
        @Directive({selector: '[test]'})
        class TestDirective {
          constructor(@Attribute('test') test: string) { log.push(test); }
        }
        const template = '<div [ngSwitch]="switchValue">' +
            '<div *ngSwitchCase="\'a\'" test="aCase"></div>' +
            '<div *ngSwitchDefault test="defaultCase"></div>' +
            '</div>';
        TestBed.configureTestingModule({declarations: [TestDirective]});
        TestBed.overrideComponent(TestComponent, {set: {template: template}})
            .createComponent(TestComponent);
        const fixture = TestBed.createComponent(TestComponent);
        fixture.componentInstance.switchValue = 'a';
        fixture.detectChanges();
        expect(log).toEqual(['aCase']);
      });
      it('should create the default case if there is no other case', () => {
        const template = '<div>' +
            '<ul [ngSwitch]="switchValue">' +
            '<template ngSwitchDefault><li>when default1;</li></template>' +
            '<template ngSwitchDefault><li>when default2;</li></template>' +
            '</ul></div>';
        fixture = createTestComponent(template);
        detectChangesAndExpectText('when default1;when default2;');
      });
      it('should allow defaults before cases', () => {
        const template = '<div>' +
            '<ul [ngSwitch]="switchValue">' +
            '<template ngSwitchDefault><li>when default1;</li></template>' +
            '<template ngSwitchDefault><li>when default2;</li></template>' +
            '<template ngSwitchCase="a"><li>when a1;</li></template>' +
            '<template ngSwitchCase="b"><li>when b1;</li></template>' +
            '<template ngSwitchCase="a"><li>when a2;</li></template>' +
            '<template ngSwitchCase="b"><li>when b2;</li></template>' +
            '</ul></div>';
        fixture = createTestComponent(template);
        detectChangesAndExpectText('when default1;when default2;');
        getComponent().switchValue = 'a';
        detectChangesAndExpectText('when a1;when a2;');
        getComponent().switchValue = 'b';
        detectChangesAndExpectText('when b1;when b2;');
      });
    });
  });
 }
--- 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 {beforeEach, describe, inject, it} from '@angular/core/testing/testing_internal';
+import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
 import {expect} from '@angular/platform-browser/testing/matchers';
 import {NgLocaleLocalization, NgLocalization, getPluralCategory} from '../src/localization';
--- a/modules/@angular/common/test/pipes/async_pipe_spec.ts
+++ b/modules/@angular/common/test/pipes/async_pipe_spec.ts
@ -8,21 +8,22 @@
 import {AsyncPipe} from '@angular/common';
 import {WrappedValue} from '@angular/core';
-import {AsyncTestCompleter, beforeEach, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
+import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} 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 {EventEmitter} from '../../src/facade/async';
 import {isBlank} from '../../src/facade/lang';
 import {SpyChangeDetectorRef} from '../spies';
 export function main() {
  describe('AsyncPipe', () => {
    describe('Observable', () => {
-      let emitter: EventEmitter<any>;
+      var emitter: EventEmitter<any>;
-      let pipe: AsyncPipe;
+      var pipe: AsyncPipe;
-      let ref: any;
+      var ref: any;
-      const message = {};
+      var message = {};
      beforeEach(() => {
        emitter = new EventEmitter();
@ -62,7 +63,7 @@ export function main() {
           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
             pipe.transform(emitter);
-             const newEmitter = new EventEmitter();
+             var newEmitter = new EventEmitter();
             expect(pipe.transform(newEmitter)).toBe(null);
             emitter.emit(message);
@ -104,14 +105,14 @@ export function main() {
    });
    describe('Promise', () => {
-      const message = new Object();
+      var message = new Object();
-      let pipe: AsyncPipe;
+      var pipe: AsyncPipe;
-      let resolve: (result: any) => void;
+      var resolve: (result: any) => void;
-      let reject: (error: any) => void;
+      var reject: (error: any) => void;
-      let promise: Promise<any>;
+      var promise: Promise<any>;
-      let ref: SpyChangeDetectorRef;
+      var ref: SpyChangeDetectorRef;
      // adds longer timers for passing tests in IE
-      const timer = (getDOM() && browserDetection.isIE) ? 50 : 10;
+      var timer = (!isBlank(getDOM()) && browserDetection.isIE) ? 50 : 10;
      beforeEach(() => {
        promise = new Promise((res, rej) => {
@ -154,7 +155,7 @@ export function main() {
           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
             pipe.transform(promise);
-             promise = new Promise<any>(() => {});
+             var promise = new Promise<any>(() => {});
             expect(pipe.transform(promise)).toBe(null);
             // this should not affect the pipe, so it should return WrappedValue
@ -168,7 +169,7 @@ export function main() {
        it('should request a change detection check upon receiving a new value',
           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
-             const markForCheck = ref.spy('markForCheck');
+             var markForCheck = ref.spy('markForCheck');
             pipe.transform(promise);
             resolve(message);
@ -202,14 +203,14 @@ export function main() {
    describe('null', () => {
      it('should return null when given null', () => {
-        const pipe = new AsyncPipe(null);
+        var pipe = new AsyncPipe(null);
        expect(pipe.transform(null)).toEqual(null);
      });
    });
    describe('other types', () => {
      it('should throw when given an invalid object', () => {
-        const pipe = new AsyncPipe(null);
+        var pipe = new AsyncPipe(null);
        expect(() => pipe.transform(<any>'some bogus object')).toThrowError();
      });
    });
--- a/modules/@angular/common/test/pipes/date_pipe_spec.ts
+++ b/modules/@angular/common/test/pipes/date_pipe_spec.ts
@ -8,18 +8,15 @@
 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 {browserDetection} from '@angular/platform-browser/testing/browser_util';
 import {DateWrapper} from '../../src/facade/lang';
 export function main() {
  describe('DatePipe', () => {
-    let date: Date;
+    var date: Date;
-    const isoStringWithoutTime = '2015-01-01';
+    var pipe: DatePipe;
    let pipe: DatePipe;
    // Check the transformation of a date into a pattern
    function expectDateFormatAs(date: Date | string, pattern: any, output: string): void {
      expect(pipe.transform(date, pattern)).toEqual(output);
    }
    // TODO: reactivate the disabled expectations once emulators are fixed in SauceLabs
    // In some old versions of Chrome in Android emulators, time formatting returns dates in the
@ -30,7 +27,7 @@ export function main() {
    // Tracking issue: https://github.com/angular/angular/issues/11187
    beforeEach(() => {
-      date = new Date(2015, 5, 15, 9, 3, 1);
+      date = DateWrapper.create(2015, 6, 15, 9, 3, 1);
      pipe = new DatePipe('en-US');
    });
@ -39,9 +36,7 @@ export function main() {
    describe('supports', () => {
      it('should support date', () => { expect(() => pipe.transform(date)).not.toThrow(); });
      it('should support int', () => { expect(() => pipe.transform(123456789)).not.toThrow(); });
      it('should support numeric strings',
         () => { expect(() => pipe.transform('123456789')).not.toThrow(); });
@ -49,143 +44,85 @@ export function main() {
         () => { expect(() => pipe.transform('123456789.11')).not.toThrow(); });
      it('should support ISO string',
-         () => expect(() => pipe.transform('2015-06-15T21:43:11Z')).not.toThrow());
+         () => { expect(() => pipe.transform('2015-06-15T21:43:11Z')).not.toThrow(); });
-      it('should return null for empty string', () => expect(pipe.transform('')).toEqual(null));
+      it('should not support other objects', () => {
-
+        expect(() => pipe.transform({})).toThrow();
-      it('should support ISO string without time',
+        expect(() => pipe.transform('')).toThrow();
-         () => { expect(() => pipe.transform(isoStringWithoutTime)).not.toThrow(); });
+      });
      it('should not support other objects',
         () => { expect(() => pipe.transform({})).toThrowError(); });
    });
    describe('transform', () => {
      it('should format each component correctly', () => {
-        const dateFixtures: any = {
+        expect(pipe.transform(date, 'y')).toEqual('2015');
-          'y': '2015',
+        expect(pipe.transform(date, 'yy')).toEqual('15');
-          'yy': '15',
+        expect(pipe.transform(date, 'M')).toEqual('6');
-          'M': '6',
+        expect(pipe.transform(date, 'MM')).toEqual('06');
-          'MM': '06',
+        expect(pipe.transform(date, 'MMM')).toEqual('Jun');
-          'MMM': 'Jun',
+        expect(pipe.transform(date, 'MMMM')).toEqual('June');
-          'MMMM': 'June',
+        expect(pipe.transform(date, 'd')).toEqual('15');
-          'd': '15',
+        expect(pipe.transform(date, 'E')).toEqual('Mon');
-          'dd': '15',
+        expect(pipe.transform(date, 'EEEE')).toEqual('Monday');
          'EEE': 'Mon',
          'EEEE': 'Monday'
        };
        const isoStringWithoutTimeFixtures: any = {
          'y': '2015',
          'yy': '15',
          'M': '1',
          'MM': '01',
          'MMM': 'Jan',
          'MMMM': 'January',
          'd': '1',
          'dd': '01',
          'EEE': 'Thu',
          'EEEE': 'Thursday'
        };
        if (!browserDetection.isOldChrome) {
-          dateFixtures['h'] = '9';
+          expect(pipe.transform(date, 'h')).toEqual('9');
-          dateFixtures['hh'] = '09';
+          expect(pipe.transform(date, 'hh')).toEqual('09');
-          dateFixtures['j'] = '9 AM';
+          expect(pipe.transform(date, 'j')).toEqual('9 AM');
          isoStringWithoutTimeFixtures['h'] = '12';
          isoStringWithoutTimeFixtures['hh'] = '12';
          isoStringWithoutTimeFixtures['j'] = '12 AM';
        }
        // IE and Edge can't format a date to minutes and seconds without hours
        if (!browserDetection.isEdge && !browserDetection.isIE ||
            !browserDetection.supportsNativeIntlApi) {
          if (!browserDetection.isOldChrome) {
-            dateFixtures['HH'] = '09';
+            expect(pipe.transform(date, 'HH')).toEqual('09');
            isoStringWithoutTimeFixtures['HH'] = '00';
          }
-          dateFixtures['E'] = 'M';
+          expect(pipe.transform(date, 'm')).toEqual('3');
-          dateFixtures['L'] = 'J';
+          expect(pipe.transform(date, 's')).toEqual('1');
-          dateFixtures['m'] = '3';
+          expect(pipe.transform(date, 'mm')).toEqual('03');
-          dateFixtures['s'] = '1';
+          expect(pipe.transform(date, 'ss')).toEqual('01');
          dateFixtures['mm'] = '03';
          dateFixtures['ss'] = '01';
          isoStringWithoutTimeFixtures['m'] = '0';
          isoStringWithoutTimeFixtures['s'] = '0';
          isoStringWithoutTimeFixtures['mm'] = '00';
          isoStringWithoutTimeFixtures['ss'] = '00';
        }
        Object.keys(dateFixtures).forEach((pattern: string) => {
          expectDateFormatAs(date, pattern, dateFixtures[pattern]);
        });
        Object.keys(isoStringWithoutTimeFixtures).forEach((pattern: string) => {
          expectDateFormatAs(isoStringWithoutTime, pattern, isoStringWithoutTimeFixtures[pattern]);
        });
        expect(pipe.transform(date, 'Z')).toBeDefined();
      });
      it('should format common multi component patterns', () => {
-        const dateFixtures: any = {
+        expect(pipe.transform(date, 'E, M/d/y')).toEqual('Mon, 6/15/2015');
-          'EEE, M/d/y': 'Mon, 6/15/2015',
+        expect(pipe.transform(date, 'E, M/d')).toEqual('Mon, 6/15');
-          'EEE, M/d': 'Mon, 6/15',
+        expect(pipe.transform(date, 'MMM d')).toEqual('Jun 15');
-          'MMM d': 'Jun 15',
+        expect(pipe.transform(date, 'dd/MM/yyyy')).toEqual('15/06/2015');
-          'dd/MM/yyyy': '15/06/2015',
+        expect(pipe.transform(date, 'MM/dd/yyyy')).toEqual('06/15/2015');
-          'MM/dd/yyyy': '06/15/2015',
+        expect(pipe.transform(date, 'yMEd')).toEqual('20156Mon15');
-          'yMEEEd': '20156Mon15',
+        expect(pipe.transform(date, 'MEd')).toEqual('6Mon15');
-          'MEEEd': '6Mon15',
+        expect(pipe.transform(date, 'MMMd')).toEqual('Jun15');
-          'MMMd': 'Jun15',
+        expect(pipe.transform(date, 'yMMMMEEEEd')).toEqual('Monday, June 15, 2015');
          'yMMMMEEEEd': 'Monday, June 15, 2015'
        };
        // IE and Edge can't format a date to minutes and seconds without hours
        if (!browserDetection.isEdge && !browserDetection.isIE ||
            !browserDetection.supportsNativeIntlApi) {
-          dateFixtures['ms'] = '31';
+          expect(pipe.transform(date, 'ms')).toEqual('31');
        }
        if (!browserDetection.isOldChrome) {
-          dateFixtures['jm'] = '9:03 AM';
+          expect(pipe.transform(date, 'jm')).toEqual('9:03 AM');
        }
        Object.keys(dateFixtures).forEach((pattern: string) => {
          expectDateFormatAs(date, pattern, dateFixtures[pattern]);
        });
      });
      it('should format with pattern aliases', () => {
        const dateFixtures: any = {
          'MM/dd/yyyy': '06/15/2015',
          'fullDate': 'Monday, June 15, 2015',
          'longDate': 'June 15, 2015',
          'mediumDate': 'Jun 15, 2015',
          'shortDate': '6/15/2015'
        };
        if (!browserDetection.isOldChrome) {
          // IE and Edge do not add a coma after the year in these 2 cases
          if ((browserDetection.isEdge || browserDetection.isIE) &&
              browserDetection.supportsNativeIntlApi) {
-            dateFixtures['medium'] = 'Jun 15, 2015 9:03:01 AM';
+            expect(pipe.transform(date, 'medium')).toEqual('Jun 15, 2015 9:03:01 AM');
-            dateFixtures['short'] = '6/15/2015 9:03 AM';
+            expect(pipe.transform(date, 'short')).toEqual('6/15/2015 9:03 AM');
          } else {
-            dateFixtures['medium'] = 'Jun 15, 2015, 9:03:01 AM';
+            expect(pipe.transform(date, 'medium')).toEqual('Jun 15, 2015, 9:03:01 AM');
-            dateFixtures['short'] = '6/15/2015, 9:03 AM';
+            expect(pipe.transform(date, 'short')).toEqual('6/15/2015, 9:03 AM');
          }
        }
-
+        expect(pipe.transform(date, 'MM/dd/yyyy')).toEqual('06/15/2015');
        expect(pipe.transform(date, 'fullDate')).toEqual('Monday, June 15, 2015');
        expect(pipe.transform(date, 'longDate')).toEqual('June 15, 2015');
        expect(pipe.transform(date, 'mediumDate')).toEqual('Jun 15, 2015');
        expect(pipe.transform(date, 'shortDate')).toEqual('6/15/2015');
        if (!browserDetection.isOldChrome) {
-          dateFixtures['mediumTime'] = '9:03:01 AM';
+          expect(pipe.transform(date, 'mediumTime')).toEqual('9:03:01 AM');
-          dateFixtures['shortTime'] = '9:03 AM';
+          expect(pipe.transform(date, 'shortTime')).toEqual('9:03 AM');
        }
        Object.keys(dateFixtures).forEach((pattern: string) => {
          expectDateFormatAs(date, pattern, dateFixtures[pattern]);
        });
      });
      it('should remove bidi control characters',
--- a/modules/@angular/common/test/pipes/i18n_plural_pipe_spec.ts
+++ b/modules/@angular/common/test/pipes/i18n_plural_pipe_spec.ts
@ -8,14 +8,14 @@
 import {I18nPluralPipe, NgLocalization} from '@angular/common';
 import {PipeResolver} from '@angular/compiler/src/pipe_resolver';
-import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal';
+import {afterEach, beforeEach, ddescribe, describe, expect, iit, it, xit} from '@angular/core/testing/testing_internal';
 export function main() {
  describe('I18nPluralPipe', () => {
-    let localization: NgLocalization;
+    var localization: NgLocalization;
-    let pipe: I18nPluralPipe;
+    var pipe: I18nPluralPipe;
-    const mapping = {
+    var mapping = {
      '=0': 'No messages.',
      '=1': 'One message.',
      'many': 'Many messages.',
@ -32,27 +32,27 @@ export function main() {
    describe('transform', () => {
      it('should return 0 text if value is 0', () => {
-        const val = pipe.transform(0, mapping);
+        var val = pipe.transform(0, mapping);
        expect(val).toEqual('No messages.');
      });
      it('should return 1 text if value is 1', () => {
-        const val = pipe.transform(1, mapping);
+        var val = pipe.transform(1, mapping);
        expect(val).toEqual('One message.');
      });
      it('should return category messages', () => {
-        const val = pipe.transform(4, mapping);
+        var val = pipe.transform(4, mapping);
        expect(val).toEqual('Many messages.');
      });
      it('should interpolate the value into the text where indicated', () => {
-        const val = pipe.transform(6, mapping);
+        var val = pipe.transform(6, mapping);
        expect(val).toEqual('There are 6 messages, that is 6.');
      });
      it('should use "" if value is undefined', () => {
-        const val = pipe.transform(void(0), mapping);
+        var val = pipe.transform(void(0), mapping);
        expect(val).toEqual('');
      });
--- a/modules/@angular/common/test/pipes/i18n_select_pipe_spec.ts
+++ b/modules/@angular/common/test/pipes/i18n_select_pipe_spec.ts
@ -8,35 +8,40 @@
 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';
 export function main() {
  describe('I18nSelectPipe', () => {
-    const pipe: I18nSelectPipe = new I18nSelectPipe();
+    var pipe: I18nSelectPipe;
-    const mapping = {'male': 'Invite him.', 'female': 'Invite her.', 'other': 'Invite them.'};
+    var mapping = {'male': 'Invite him.', 'female': 'Invite her.', 'other': 'Invite them.'};
    beforeEach(() => { pipe = new I18nSelectPipe(); });
    it('should be marked as pure',
       () => { expect(new PipeResolver().resolve(I18nSelectPipe).pure).toEqual(true); });
    describe('transform', () => {
-      it('should return the "male" text if value is "male"', () => {
+      it('should return male text if value is male', () => {
-        const val = pipe.transform('male', mapping);
+        var val = pipe.transform('male', mapping);
        expect(val).toEqual('Invite him.');
      });
-      it('should return the "female" text if value is "female"', () => {
+      it('should return female text if value is female', () => {
-        const val = pipe.transform('female', mapping);
+        var val = pipe.transform('female', mapping);
        expect(val).toEqual('Invite her.');
      });
-      it('should return the "other" text if value is neither "male" nor "female"',
+      it('should return "" if value is anything other than male or female', () => {
-         () => { expect(pipe.transform('Anything else', mapping)).toEqual('Invite them.'); });
+        var val = pipe.transform('Anything else', mapping);
-
+        expect(val).toEqual('');
      it('should return an empty text if value is null or undefined', () => {
        expect(pipe.transform(null, mapping)).toEqual('');
        expect(pipe.transform(void 0, mapping)).toEqual('');
      });
-      it('should throw on bad arguments',
+      it('should use "" if value is undefined', () => {
        var val = pipe.transform(void(0), mapping);
        expect(val).toEqual('');
      });
      it('should not support bad arguments',
         () => { expect(() => pipe.transform('male', <any>'hey')).toThrowError(); });
    });
--- a/modules/@angular/common/test/pipes/json_pipe_spec.ts
+++ b/modules/@angular/common/test/pipes/json_pipe_spec.ts
@ -11,14 +11,16 @@ import {Component} from '@angular/core';
 import {TestBed, async} from '@angular/core/testing';
 import {expect} from '@angular/platform-browser/testing/matchers';
 import {Json, StringWrapper} from '../../src/facade/lang';
 export function main() {
  describe('JsonPipe', () => {
-    const regNewLine = '\n';
+    var regNewLine = '\n';
-    let inceptionObj: any;
+    var inceptionObj: any;
-    let inceptionObjString: string;
+    var inceptionObjString: string;
-    let pipe: JsonPipe;
+    var pipe: JsonPipe;
-    function normalize(obj: string): string { return obj.replace(regNewLine, ''); }
+    function normalize(obj: string): string { return StringWrapper.replace(obj, regNewLine, ''); }
    beforeEach(() => {
      inceptionObj = {dream: {dream: {dream: 'Limbo'}}};
@ -39,14 +41,14 @@ export function main() {
         () => { expect(pipe.transform(inceptionObj)).toEqual(inceptionObjString); });
      it('should return JSON-formatted string even when normalized', () => {
-        const dream1 = normalize(pipe.transform(inceptionObj));
+        var dream1 = normalize(pipe.transform(inceptionObj));
-        const dream2 = normalize(inceptionObjString);
+        var dream2 = normalize(inceptionObjString);
        expect(dream1).toEqual(dream2);
      });
      it('should return JSON-formatted string similar to Json.stringify', () => {
-        const dream1 = normalize(pipe.transform(inceptionObj));
+        var dream1 = normalize(pipe.transform(inceptionObj));
-        const dream2 = normalize(JSON.stringify(inceptionObj, null, 2));
+        var dream2 = normalize(Json.stringify(inceptionObj));
        expect(dream1).toEqual(dream2);
      });
    });
@ -63,8 +65,8 @@ export function main() {
      });
      it('should work with mutable objects', async(() => {
-           const fixture = TestBed.createComponent(TestComp);
+           let fixture = TestBed.createComponent(TestComp);
-           const mutable: number[] = [1];
+           let mutable: number[] = [1];
           fixture.componentInstance.data = mutable;
           fixture.detectChanges();
           expect(fixture.nativeElement).toHaveText('[\n  1\n]');
@ -72,6 +74,7 @@ export function main() {
           mutable.push(2);
           fixture.detectChanges();
           expect(fixture.nativeElement).toHaveText('[\n  1,\n  2\n]');
         }));
    });
  });
--- a/modules/@angular/common/test/pipes/lowercase_pipe_spec.ts
+++ b/modules/@angular/common/test/pipes/lowercase_pipe_spec.ts
@ -7,13 +7,13 @@
 */
 import {LowerCasePipe} from '@angular/common';
-import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal';
+import {afterEach, beforeEach, ddescribe, describe, expect, iit, it, xit} from '@angular/core/testing/testing_internal';
 export function main() {
  describe('LowerCasePipe', () => {
-    let upper: string;
+    var upper: string;
-    let lower: string;
+    var lower: string;
-    let pipe: LowerCasePipe;
+    var pipe: LowerCasePipe;
    beforeEach(() => {
      lower = 'something';
@ -23,14 +23,14 @@ export function main() {
    describe('transform', () => {
      it('should return lowercase', () => {
-        const val = pipe.transform(upper);
+        var val = pipe.transform(upper);
        expect(val).toEqual(lower);
      });
      it('should lowercase when there is a new value', () => {
-        const val = pipe.transform(upper);
+        var val = pipe.transform(upper);
        expect(val).toEqual(lower);
-        const val2 = pipe.transform('WAT');
+        var val2 = pipe.transform('WAT');
        expect(val2).toEqual('wat');
      });
--- a/modules/@angular/common/test/pipes/number_pipe_spec.ts
+++ b/modules/@angular/common/test/pipes/number_pipe_spec.ts
@ -7,13 +7,13 @@
 */
 import {CurrencyPipe, DecimalPipe, PercentPipe} from '@angular/common';
-import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal';
+import {afterEach, beforeEach, ddescribe, describe, expect, iit, it, xit} from '@angular/core/testing/testing_internal';
 import {browserDetection} from '@angular/platform-browser/testing/browser_util';
 export function main() {
  describe('Number pipes', () => {
    describe('DecimalPipe', () => {
-      let pipe: DecimalPipe;
+      var pipe: DecimalPipe;
      beforeEach(() => { pipe = new DecimalPipe('en-US'); });
@ -44,7 +44,7 @@ export function main() {
    });
    describe('PercentPipe', () => {
-      let pipe: PercentPipe;
+      var pipe: PercentPipe;
      beforeEach(() => { pipe = new PercentPipe('en-US'); });
@ -60,7 +60,7 @@ export function main() {
    });
    describe('CurrencyPipe', () => {
-      let pipe: CurrencyPipe;
+      var pipe: CurrencyPipe;
      beforeEach(() => { pipe = new CurrencyPipe('en-US'); });
--- a/modules/@angular/common/test/pipes/slice_pipe_spec.ts
+++ b/modules/@angular/common/test/pipes/slice_pipe_spec.ts
@ -9,13 +9,14 @@
 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() {
  describe('SlicePipe', () => {
-    let list: number[];
+    var list: number[];
-    let str: string;
+    var str: string;
-    let pipe: SlicePipe;
+    var pipe: SlicePipe;
    beforeEach(() => {
      list = [1, 2, 3, 4, 5];
@ -93,8 +94,8 @@ export function main() {
      });
      it('should work with mutable arrays', async(() => {
-           const fixture = TestBed.createComponent(TestComp);
+           let fixture = TestBed.createComponent(TestComp);
-           const mutable: number[] = [1, 2];
+           let mutable: number[] = [1, 2];
           fixture.componentInstance.data = mutable;
           fixture.detectChanges();
           expect(fixture.nativeElement).toHaveText('2');
--- a/modules/@angular/common/test/pipes/uppercase_pipe_spec.ts
+++ b/modules/@angular/common/test/pipes/uppercase_pipe_spec.ts
@ -7,13 +7,13 @@
 */
 import {UpperCasePipe} from '@angular/common';
-import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal';
+import {afterEach, beforeEach, ddescribe, describe, expect, iit, it, xit} from '@angular/core/testing/testing_internal';
 export function main() {
  describe('UpperCasePipe', () => {
-    let upper: string;
+    var upper: string;
-    let lower: string;
+    var lower: string;
-    let pipe: UpperCasePipe;
+    var pipe: UpperCasePipe;
    beforeEach(() => {
      lower = 'something';
@ -24,14 +24,14 @@ export function main() {
    describe('transform', () => {
      it('should return uppercase', () => {
-        const val = pipe.transform(lower);
+        var val = pipe.transform(lower);
        expect(val).toEqual(upper);
      });
      it('should uppercase when there is a new value', () => {
-        const val = pipe.transform(lower);
+        var val = pipe.transform(lower);
        expect(val).toEqual(upper);
-        const val2 = pipe.transform('wat');
+        var val2 = pipe.transform('wat');
        expect(val2).toEqual('WAT');
      });
--- 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} from '@angular/core/testing/testing_internal';
+import {SpyObject, proxy} from '@angular/core/testing/testing_internal';
 export class SpyChangeDetectorRef extends SpyObject {
  constructor() {
--- a/modules/@angular/common/testing/location_mock.ts
+++ b/modules/@angular/common/testing/location_mock.ts
@ -34,8 +34,8 @@ export class SpyLocation implements Location {
  path(): string { return this._history[this._historyIndex].path; }
  isCurrentPathEqualTo(path: string, query: string = ''): boolean {
-    const givenPath = path.endsWith('/') ? path.substring(0, path.length - 1) : path;
+    var givenPath = path.endsWith('/') ? path.substring(0, path.length - 1) : path;
-    const currPath =
+    var currPath =
        this.path().endsWith('/') ? this.path().substring(0, this.path().length - 1) : this.path();
    return currPath == givenPath + (query.length > 0 ? ('?' + query) : '');
@ -66,12 +66,12 @@ export class SpyLocation implements Location {
    this._history.push(new LocationState(path, query));
    this._historyIndex = this._history.length - 1;
-    const locationState = this._history[this._historyIndex - 1];
+    var locationState = this._history[this._historyIndex - 1];
    if (locationState.path == path && locationState.query == query) {
      return;
    }
-    const url = path + (query.length > 0 ? ('?' + query) : '');
+    var url = path + (query.length > 0 ? ('?' + query) : '');
    this.urlChanges.push(url);
    this._subject.emit({'url': url, 'pop': false});
  }
@ -79,7 +79,7 @@ export class SpyLocation implements Location {
  replaceState(path: string, query: string = '') {
    path = this.prepareExternalUrl(path);
-    const history = this._history[this._historyIndex];
+    var history = this._history[this._historyIndex];
    if (history.path == path && history.query == query) {
      return;
    }
@ -87,7 +87,7 @@ export class SpyLocation implements Location {
    history.path = path;
    history.query = query;
-    const url = path + (query.length > 0 ? ('?' + query) : '');
+    var url = path + (query.length > 0 ? ('?' + query) : '');
    this.urlChanges.push('replace: ' + url);
  }
--- a/modules/@angular/common/testing/mock_location_strategy.ts
+++ b/modules/@angular/common/testing/mock_location_strategy.ts
@ -44,20 +44,20 @@ export class MockLocationStrategy extends LocationStrategy {
  pushState(ctx: any, title: string, path: string, query: string): void {
    this.internalTitle = title;
-    const url = path + (query.length > 0 ? ('?' + query) : '');
+    var url = path + (query.length > 0 ? ('?' + query) : '');
    this.internalPath = url;
-    const externalUrl = this.prepareExternalUrl(url);
+    var externalUrl = this.prepareExternalUrl(url);
    this.urlChanges.push(externalUrl);
  }
  replaceState(ctx: any, title: string, path: string, query: string): void {
    this.internalTitle = title;
-    const url = path + (query.length > 0 ? ('?' + query) : '');
+    var url = path + (query.length > 0 ? ('?' + query) : '');
    this.internalPath = url;
-    const externalUrl = this.prepareExternalUrl(url);
+    var externalUrl = this.prepareExternalUrl(url);
    this.urlChanges.push('replace: ' + externalUrl);
  }
@ -68,7 +68,7 @@ export class MockLocationStrategy extends LocationStrategy {
  back(): void {
    if (this.urlChanges.length > 0) {
      this.urlChanges.pop();
-      const nextUrl = this.urlChanges.length > 0 ? this.urlChanges[this.urlChanges.length - 1] : '';
+      var nextUrl = this.urlChanges.length > 0 ? this.urlChanges[this.urlChanges.length - 1] : '';
      this.simulatePopState(nextUrl);
    }
  }
--- a/modules/@angular/compiler-cli/README.md
+++ b/modules/@angular/compiler-cli/README.md
@ -27,7 +27,7 @@ Then you can add an import statement in the `bootstrap` allowing you to bootstra
 generated code:
 ```typescript
-main.module.ts
+main_module.ts
 -------------
 import {BrowserModule} from '@angular/platform-browser';
 import {Component, NgModule, ApplicationRef} from '@angular/core';
@ -49,7 +49,7 @@ export class MainModule {
 bootstrap.ts
 -------------
-import {MainModuleNgFactory} from './main.module.ngfactory';
+import {MainModuleNgFactory} from './main_module.ngfactory';
 import {platformBrowser} from '@angular/platform-browser';
 platformBrowser().bootstrapModuleFactory(MainModuleNgFactory);
--- a/modules/@angular/compiler-cli/index.ts
+++ b/modules/@angular/compiler-cli/index.ts
@ -7,7 +7,6 @@
 */
 export {CodeGenerator} from './src/codegen';
 export {Extractor} from './src/extractor';
 export {NodeReflectorHostContext, ReflectorHost, ReflectorHostContext} from './src/reflector_host';
 export {StaticReflector, StaticReflectorHost, StaticSymbol} from './src/static_reflector';
--- a/modules/@angular/compiler-cli/integrationtest/benchmarks/README.md
+++ b/modules/@angular/compiler-cli/integrationtest/benchmarks/README.md
@ -1,6 +0,0 @@
 # Overview
 This folder will be filled with the benchmark sources
 so that we can do offline compilation for them.
--- a/modules/@angular/compiler-cli/integrationtest/src/comp_using_3rdp.ts
+++ b/modules/@angular/compiler-cli/integrationtest/src/comp_using_3rdp.ts
@ -1,18 +0,0 @@
 /**
 * @license
 * Copyright Google Inc. All Rights Reserved.
 *
 * Use of this source code is governed by an MIT-style license that can be
 * found in the LICENSE file at https://angular.io/license
 */
 import {Component} from '@angular/core';
@Component({
  selector: 'use-third-party',
  template: '<third-party-comp [thirdParty]="title"></third-party-comp>' +
      '<another-third-party-comp></another-third-party-comp>',
 })
 export class ComponentUsingThirdParty {
  title: string = 'from 3rd party';
 }
--- a/modules/@angular/compiler-cli/integrationtest/src/messages.fi.xlf
+++ b/modules/@angular/compiler-cli/integrationtest/src/messages.fi.xlf
@ -12,10 +12,6 @@
                <source>Welcome</source>
                <target>tervetuloa</target>
            </trans-unit>
            <trans-unit id="63a85808f03b8181e36a952e0fa38202c2304862" datatype="html">
                <source>other-3rdP-component</source>
                <target>other-3rdP-component</target>
            </trans-unit>
        </body>
    </file>
 </xliff>
--- a/modules/@angular/compiler-cli/integrationtest/src/messages.fi.xtb
+++ b/modules/@angular/compiler-cli/integrationtest/src/messages.fi.xtb
@ -9,5 +9,4 @@
 <translationbundle>
  <translation id="76e1eccb1b772fa9f294ef9c146ea6d0efa8a2d4">käännä teksti</translation>
  <translation id="65cc4ab3b4c438e07c89be2b677d08369fb62da2">tervetuloa</translation>
  <translation id="63a85808f03b8181e36a952e0fa38202c2304862">other-3rdP-component</translation>
 </translationbundle>
--- a/modules/@angular/compiler-cli/integrationtest/src/module.ts
+++ b/modules/@angular/compiler-cli/integrationtest/src/module.ts
@ -8,15 +8,12 @@
 import {ApplicationRef, NgModule} from '@angular/core';
 import {FormsModule} from '@angular/forms';
-import {ServerModule} from '@angular/platform-server';
+import {BrowserModule} from '@angular/platform-browser';
 import {MdButtonModule} from '@angular2-material/button';
 import {ThirdpartyModule} from '../third_party_src/module';
 import {MultipleComponentsMyComp, NextComp} from './a/multiple_components';
 import {AnimateCmp} from './animate';
 import {BasicComp} from './basic';
 import {ComponentUsingThirdParty} from './comp_using_3rdp';
 import {CompWithAnalyzeEntryComponentsProvider, CompWithEntryComponents} from './entry_components';
 import {CompConsumingEvents, CompUsingPipes, CompWithProviders, CompWithReferences, DirPublishingEvents, ModuleUsingCustomElements} from './features';
 import {CompUsingRootModuleDirectiveAndPipe, SomeDirectiveInRootModule, SomePipeInRootModule, SomeService, someLibModuleWithProviders} from './module_fixtures';
@ -25,47 +22,35 @@ import {CompForChildQuery, CompWithChildQuery, CompWithDirectiveChild, Directive
@NgModule({
  declarations: [
    AnimateCmp,
    BasicComp,
    CompConsumingEvents,
    CompForChildQuery,
    CompUsingPipes,
    CompUsingRootModuleDirectiveAndPipe,
    CompWithAnalyzeEntryComponentsProvider,
    CompWithChildQuery,
    CompWithDirectiveChild,
    CompWithEntryComponents,
    CompWithNgContent,
    CompWithProviders,
    CompWithReferences,
    DirectiveForQuery,
    DirPublishingEvents,
    MultipleComponentsMyComp,
    NextComp,
    ProjectingComp,
    SomeDirectiveInRootModule,
    SomePipeInRootModule,
-    ComponentUsingThirdParty,
+    AnimateCmp,
    BasicComp,
    CompForChildQuery,
    CompWithEntryComponents,
    CompWithAnalyzeEntryComponentsProvider,
    ProjectingComp,
    CompWithChildQuery,
    CompWithDirectiveChild,
    CompWithNgContent,
    CompUsingRootModuleDirectiveAndPipe,
    CompWithProviders,
    CompWithReferences,
    CompUsingPipes,
    CompConsumingEvents,
    DirPublishingEvents,
    MultipleComponentsMyComp,
    DirectiveForQuery,
    NextComp,
  ],
  imports: [
-    ServerModule,
+    BrowserModule, FormsModule, someLibModuleWithProviders(), ModuleUsingCustomElements,
-    FormsModule,
+    MdButtonModule
    MdButtonModule,
    ModuleUsingCustomElements,
    someLibModuleWithProviders(),
    ThirdpartyModule,
  ],
  providers: [SomeService],
  entryComponents: [
-    AnimateCmp,
+    AnimateCmp, BasicComp, CompWithEntryComponents, CompWithAnalyzeEntryComponentsProvider,
-    BasicComp,
+    ProjectingComp, CompWithChildQuery, CompUsingRootModuleDirectiveAndPipe, CompWithReferences
    CompUsingRootModuleDirectiveAndPipe,
    CompWithAnalyzeEntryComponentsProvider,
    CompWithChildQuery,
    CompWithEntryComponents,
    CompWithReferences,
    ProjectingComp,
    ComponentUsingThirdParty,
  ]
 })
 export class MainModule {
--- a/modules/@angular/compiler-cli/integrationtest/src/module_fixtures.ts
+++ b/modules/@angular/compiler-cli/integrationtest/src/module_fixtures.ts
@ -8,6 +8,7 @@
 import {LowerCasePipe, NgIf} from '@angular/common';
 import {ANALYZE_FOR_ENTRY_COMPONENTS, Component, ComponentFactoryResolver, Directive, Inject, Injectable, Input, ModuleWithProviders, NgModule, OpaqueToken, Pipe} from '@angular/core';
 import {BrowserModule} from '@angular/platform-browser';
@Injectable()
 export class SomeService {
--- a/modules/@angular/compiler-cli/integrationtest/test/animate_spec.ts
+++ b/modules/@angular/compiler-cli/integrationtest/test/animate_spec.ts
@ -19,9 +19,9 @@ describe('template codegen output', () => {
  it('should apply the animate states to the element', (done) => {
    const compFixture = createComponent(AnimateCmp);
-    const debugElement = compFixture.debugElement;
+    var debugElement = compFixture.debugElement;
-    const targetDebugElement = findTargetElement(<DebugElement>debugElement);
+    var targetDebugElement = findTargetElement(<DebugElement>debugElement);
    compFixture.componentInstance.setAsOpen();
    compFixture.detectChanges();
@ -45,9 +45,9 @@ describe('template codegen output', () => {
  it('should apply the default animate state to the element', (done) => {
    const compFixture = createComponent(AnimateCmp);
-    const debugElement = compFixture.debugElement;
+    var debugElement = compFixture.debugElement;
-    const targetDebugElement = findTargetElement(<DebugElement>debugElement);
+    var targetDebugElement = findTargetElement(<DebugElement>debugElement);
    compFixture.componentInstance.setAsSomethingElse();
    compFixture.detectChanges();
--- a/modules/@angular/compiler-cli/integrationtest/test/basic_spec.ts
+++ b/modules/@angular/compiler-cli/integrationtest/test/basic_spec.ts
@ -43,13 +43,13 @@ describe('template codegen output', () => {
  });
  it('should be able to create the basic component', () => {
-    const compFixture = createComponent(BasicComp);
+    var compFixture = createComponent(BasicComp);
    expect(compFixture.componentInstance).toBeTruthy();
  });
  it('should support ngIf', () => {
-    const compFixture = createComponent(BasicComp);
+    var compFixture = createComponent(BasicComp);
-    const debugElement = compFixture.debugElement;
+    var debugElement = compFixture.debugElement;
    expect(debugElement.children.length).toBe(3);
    compFixture.componentInstance.ctxBool = true;
@ -59,8 +59,8 @@ describe('template codegen output', () => {
  });
  it('should support ngFor', () => {
-    const compFixture = createComponent(BasicComp);
+    var compFixture = createComponent(BasicComp);
-    const debugElement = compFixture.debugElement;
+    var debugElement = compFixture.debugElement;
    expect(debugElement.children.length).toBe(3);
    // test NgFor
@ -83,9 +83,11 @@ describe('template codegen output', () => {
    });
    it('should support i18n for content tags', () => {
-      const containerElement = createComponent(BasicComp).nativeElement;
+      const compFixture = createComponent(BasicComp);
-      const pElement = containerElement.children.find((c: any) => c.name == 'p');
+      const debugElement = compFixture.debugElement;
-      const pText = pElement.children.map((c: any) => c.data).join('').trim();
+      const containerElement = <any>debugElement.nativeElement;
      const pElement = <any>containerElement.children.find((c: any) => c.name == 'p');
      const pText = <string>pElement.children.map((c: any) => c.data).join('').trim();
      expect(pText).toBe('tervetuloa');
    });
  });
--- a/modules/@angular/compiler-cli/integrationtest/test/entry_components_spec.ts
+++ b/modules/@angular/compiler-cli/integrationtest/test/entry_components_spec.ts
@ -15,8 +15,8 @@ import {createComponent} from './util';
 describe('content projection', () => {
  it('should support entryComponents in components', () => {
-    const compFixture = createComponent(CompWithEntryComponents);
+    var compFixture = createComponent(CompWithEntryComponents);
-    const cf = compFixture.componentInstance.cfr.resolveComponentFactory(BasicComp);
+    var cf = compFixture.componentInstance.cfr.resolveComponentFactory(BasicComp);
    expect(cf.componentType).toBe(BasicComp);
  });
--- a/modules/@angular/compiler-cli/integrationtest/test/i18n_spec.ts
+++ b/modules/@angular/compiler-cli/integrationtest/test/i18n_spec.ts
@ -34,34 +34,27 @@ const EXPECTED_XMB = `<?xml version="1.0" encoding="UTF-8" ?>
 <!ELEMENT ex (#PCDATA)>
 ]>
 <messagebundle>
  <msg id="63a85808f03b8181e36a952e0fa38202c2304862">other-3rdP-component</msg>
  <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">
+ <file source-language="en" datatype="plaintext" original="ng2.template">
-    <body>
+   <body>
-      <trans-unit id="63a85808f03b8181e36a952e0fa38202c2304862" datatype="html">
+     <trans-unit id="76e1eccb1b772fa9f294ef9c146ea6d0efa8a2d4" datatype="html">
-        <source>other-3rdP-component</source>
+       <source>translate me</source>
-        <target/>
+       <target/>
-      </trans-unit>
+       <note priority="1" from="description">desc</note>
-      <trans-unit id="76e1eccb1b772fa9f294ef9c146ea6d0efa8a2d4" datatype="html">
+       <note priority="1" from="meaning">meaning</note>
-        <source>translate me</source>
+     </trans-unit>
-        <target/>
+     <trans-unit id="65cc4ab3b4c438e07c89be2b677d08369fb62da2" datatype="html">
-        <note priority="1" from="description">desc</note>
+       <source>Welcome</source>
-        <note priority="1" from="meaning">meaning</note>
+       <target/>
-      </trans-unit>
+     </trans-unit>
-      <trans-unit id="65cc4ab3b4c438e07c89be2b677d08369fb62da2" datatype="html">
+   </body>
-        <source>Welcome</source>
+ </file>
-        <target/>
+</xliff>`;
      </trans-unit>
    </body>
  </file>
 </xliff>
 `;
 describe('template i18n extraction output', () => {
  const outDir = '';
--- a/modules/@angular/compiler-cli/integrationtest/test/ng_module_spec.ts
+++ b/modules/@angular/compiler-cli/integrationtest/test/ng_module_spec.ts
@ -7,7 +7,6 @@
 */
 import './init';
 import {ComponentUsingThirdParty} from '../src/comp_using_3rdp';
 import {MainModule} from '../src/module';
 import {CompUsingLibModuleDirectiveAndPipe, CompUsingRootModuleDirectiveAndPipe, SOME_TOKEN, ServiceUsingLibModule, SomeLibModule, SomeService} from '../src/module_fixtures';
@ -16,9 +15,9 @@ import {createComponent, createModule} from './util';
 describe('NgModule', () => {
  it('should support providers', () => {
    const moduleRef = createModule();
-    expect(moduleRef.instance instanceof MainModule).toEqual(true);
+    expect(moduleRef.instance instanceof MainModule).toBe(true);
-    expect(moduleRef.injector.get(MainModule) instanceof MainModule).toEqual(true);
+    expect(moduleRef.injector.get(MainModule) instanceof MainModule).toBe(true);
-    expect(moduleRef.injector.get(SomeService) instanceof SomeService).toEqual(true);
+    expect(moduleRef.injector.get(SomeService) instanceof SomeService).toBe(true);
  });
  it('should support entryComponents components', () => {
@ -27,7 +26,7 @@ describe('NgModule', () => {
        CompUsingRootModuleDirectiveAndPipe);
    expect(cf.componentType).toBe(CompUsingRootModuleDirectiveAndPipe);
    const compRef = cf.create(moduleRef.injector);
-    expect(compRef.instance instanceof CompUsingRootModuleDirectiveAndPipe).toEqual(true);
+    expect(compRef.instance instanceof CompUsingRootModuleDirectiveAndPipe).toBe(true);
  });
  it('should support entryComponents via the ANALYZE_FOR_ENTRY_COMPONENTS provider and function providers in components',
@ -43,30 +42,12 @@ describe('NgModule', () => {
       ]);
     });
  describe('third-party modules', () => {
    // https://github.com/angular/angular/issues/11889
    it('should support third party entryComponents components', () => {
      const fixture = createComponent(ComponentUsingThirdParty);
      const thirdPComps = fixture.nativeElement.children;
      expect(thirdPComps[0].children[0].children[0].data).toEqual('3rdP-component');
      expect(thirdPComps[1].children[0].children[0].data).toEqual('other-3rdP-component');
    });
    // https://github.com/angular/angular/issues/12428
    it('should support third party directives', () => {
      const fixture = createComponent(ComponentUsingThirdParty);
      const debugElement = fixture.debugElement;
      fixture.detectChanges();
      expect(debugElement.children[0].properties['title']).toEqual('from 3rd party');
    });
  });
  it('should support module directives and pipes', () => {
    const compFixture = createComponent(CompUsingRootModuleDirectiveAndPipe);
    compFixture.detectChanges();
    const debugElement = compFixture.debugElement;
-    expect(debugElement.children[0].properties['title']).toEqual('transformed someValue');
+    expect(debugElement.children[0].properties['title']).toBe('transformed someValue');
  });
  it('should support module directives and pipes on lib modules', () => {
@ -74,10 +55,10 @@ describe('NgModule', () => {
    compFixture.detectChanges();
    const debugElement = compFixture.debugElement;
-    expect(debugElement.children[0].properties['title']).toEqual('transformed someValue');
+    expect(debugElement.children[0].properties['title']).toBe('transformed someValue');
-    expect(debugElement.injector.get(SomeLibModule) instanceof SomeLibModule).toEqual(true);
+    expect(debugElement.injector.get(SomeLibModule) instanceof SomeLibModule).toBe(true);
    expect(debugElement.injector.get(ServiceUsingLibModule) instanceof ServiceUsingLibModule)
-        .toEqual(true);
+        .toBe(true);
  });
 });
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Igor Minar	712d1a7c37	chore(release): v2.0.1	2016-09-23 11:28:36 -07:00
Igor Minar	16601f9359	docs(changelog): add changelog for 2.0.1	2016-09-23 10:50:42 -07:00
Miško Hevery	b81e2e7a31	fix(upgrade): allow attribute selectors for components in ng2 which are not part of upgrade (#11808 ) fixes #11280	2016-09-23 10:48:47 -07:00
Victor Berchet	98fac36706	docs(Component): API docs for .encapsulation and .interpolation	2016-09-23 10:22:24 -07:00
Victor Berchet	3e780c032e	refactor: misc cleanup	2016-09-23 10:22:05 -07:00
Victor Berchet	e09882180e	refactor(common): cleanup (#11668 )	2016-09-23 10:21:58 -07:00
Igor Minar	0e18c57a17	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.	2016-09-23 10:21:50 -07:00
Stephen Fluin	51e2b9c073	docs(contributing): remove preview references (#11795 )	2016-09-23 10:21:44 -07:00
Marc Laval	f218e240d3	ci(BrowserStack): add Safari 10 (#11796 )	2016-09-23 10:21:31 -07:00
Victor Berchet	af6b219f8e	refactor(TemplateParser): clearer error message for on* binding (#11802 ) fixes #11756	2016-09-23 10:21:15 -07:00
Suguru Inatomi	20addf5f9f	chore(ISSUE_TEMPLATE): update Angular version field (#11821 )	2016-09-23 10:21:02 -07:00
Kara Erickson	2860418a3c	fix(forms): disable all radios with disable()	2016-09-23 10:19:58 -07:00
Kara	39e251eea7	fix(forms): support unbound disabled in ngModel (#11736 )	2016-09-23 10:19:46 -07:00
Victor Berchet	d7d716d5db	chore(zone.js): update to 0.6.25 (#11725 )	2016-09-23 10:19:30 -07:00
Chuck Jazdzewski	a95d65241c	fix(compiler): Safe property access expressions work in event bindings (#11724 )	2016-09-23 10:19:24 -07:00
Victor Berchet	fdb22bd185	refactor: misc cleanup (#11654 )	2016-09-23 10:18:38 -07:00