chore(release): cut the 2.1.1 release

docs(changelog): add 2.1.1 changelog
chore(release): cut the 2.2.0-beta.0 release and add changelog
2016-10-20 15:36:02 -07:00 · 2016-10-20 15:34:35 -07:00 · 2016-10-20 15:31:47 -07:00 · 2016-10-20 15:31:24 -07:00 · 2016-10-20 15:31:11 -07:00 · 2016-10-20 15:31:04 -07:00
745 changed files with 14587 additions and 29566 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,239 +1,10 @@
 <a name="2.2.4"></a>
 ## [2.2.4](https://github.com/angular/angular/compare/2.2.3...2.2.4) (2016-11-30)
 ### Bug Fixes
 * **common:** update DatePipe to allow closure compilation ([eba53fd](https://github.com/angular/angular/commit/eba53fd))
 * **compiler:** fix performance regression caused by 5b0f9e2 ([ee2d6e5](https://github.com/angular/angular/commit/ee2d6e5)), closes [#13146](https://github.com/angular/angular/issues/13146)
 * **compiler-cli:** fix paths in source maps to be relative ([eb173bc](https://github.com/angular/angular/commit/eb173bc)), closes [#13040](https://github.com/angular/angular/issues/13040)
 <a name="2.2.3"></a>
 ## [2.2.3](https://github.com/angular/angular/compare/2.2.2...2.2.3) (2016-11-23)
 ### Bug Fixes
 * **compiler:** Revert: fix versions of `@angular/tsc-wrapped` ([015ca47](https://github.com/angular/angular/commit/015ca47))
 * **animations:** Revert: blend in all previously transitioned styles into next animation if interrupted ([c12e56e](https://github.com/angular/angular/commit/c12e56e))
 <a name="2.2.2"></a>
 ## [2.2.2](https://github.com/angular/angular/compare/2.2.1...2.2.2) (2016-11-22)
 ### Bug Fixes
 * **animations:** blend in all previously transitioned styles into next animation if interrupted ([#13014](https://github.com/angular/angular/issues/13014)) ([ea4fc9b](https://github.com/angular/angular/commit/ea4fc9b)), closes [#13013](https://github.com/angular/angular/issues/13013)
 * **benchmarks:** use sanitized style values ([#12943](https://github.com/angular/angular/issues/12943)) ([33a7902](https://github.com/angular/angular/commit/33a7902))
 * **closure:** quote date pattern aliases ([#13012](https://github.com/angular/angular/issues/13012)) ([0956ace](https://github.com/angular/angular/commit/0956ace))
 * **compiler:** fix versions of `@angular/tsc-wrapped` ([2fe6fb1](https://github.com/angular/angular/commit/2fe6fb1))
 * **router:** add a banner file for the router ([#12919](https://github.com/angular/angular/issues/12919)) ([8df328b](https://github.com/angular/angular/commit/8df328b))
 * **router:** add a banner file for the router ([#12919](https://github.com/angular/angular/issues/12919)) ([511cd4d](https://github.com/angular/angular/commit/511cd4d))
 * **router:** removes a peer dependency from router to upgrade ([115f18f](https://github.com/angular/angular/commit/115f18f))
 * **router:** removes a peer dependency from router to upgrade ([87d5d49](https://github.com/angular/angular/commit/87d5d49))
 * **router:** support redirects to named outlets ([09226d9](https://github.com/angular/angular/commit/09226d9)), closes [#12740](https://github.com/angular/angular/issues/12740) [#9921](https://github.com/angular/angular/issues/9921)
 * **upgrade:** call ng1 lifecycle hooks ([#12875](https://github.com/angular/angular/issues/12875)) ([462316b](https://github.com/angular/angular/commit/462316b))
 <a name="2.3.0-beta.0"></a>
 # [2.3.0-beta.0](https://github.com/angular/angular/compare/2.2.0...2.3.0-beta.0) (2016-11-17)
 ### Bug Fixes
 * **compiler:** assert xliff messages have translations ([7908679](https://github.com/angular/angular/commit/7908679)), closes [#12815](https://github.com/angular/angular/issues/12815) [#12604](https://github.com/angular/angular/issues/12604)
 * **compiler:** updates hash algo for xmb/xtb files ([2f14415](https://github.com/angular/angular/commit/2f14415))
 * **core:** fix placeholders handling in i18n. ([76e4911](https://github.com/angular/angular/commit/76e4911)), closes [#12512](https://github.com/angular/angular/issues/12512)
 * **core:** misc i18n fixes ([ed5e98d](https://github.com/angular/angular/commit/ed5e98d))
 * **core:** xmb serializer uses decimal messaged IDs ([08c038e](https://github.com/angular/angular/commit/08c038e)), closes [#12511](https://github.com/angular/angular/issues/12511)
 * **platform-browser:** enable AOT ([efbbefd](https://github.com/angular/angular/commit/efbbefd)), closes [#12783](https://github.com/angular/angular/issues/12783)
 ### Features
 * **core:** add `attachView` / `detachView` to ApplicationRef ([9f7d32a](https://github.com/angular/angular/commit/9f7d32a)), closes [#9293](https://github.com/angular/angular/issues/9293)
 * **core:** expose `ViewRef` as `ChangeDetectorRef` ([1b5384e](https://github.com/angular/angular/commit/1b5384e)), closes [#12722](https://github.com/angular/angular/issues/12722)
 * **core:** implements a decimal fingerprint for i18n ([582550a](https://github.com/angular/angular/commit/582550a))
 * **router:** register router with ngprobe ([c2fae72](https://github.com/angular/angular/commit/c2fae72))
 * **router_link:** add skipLocationChange and replaceUrl inputs ([#12850](https://github.com/angular/angular/issues/12850)) ([46d1502](https://github.com/angular/angular/commit/46d1502))
 Note: The 2.3.0-beta.0 release also contains all the changes present in the 2.2.1 release.
 <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 decorator defalut 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))
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -17,7 +17,7 @@ Help us keep Angular open and inclusive. Please read and follow our [Code of Con
 ## <a name="question"></a> Got a Question or Problem?
-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`.
+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](stackoverflow.com/questions/tagged/angular) where the questions should be tagged with tag `angular`.
 StackOverflow is a much better place to ask questions since:
--- a/build.sh
+++ b/build.sh
@ -14,16 +14,12 @@ PACKAGES=(core
  platform-webworker
  platform-webworker-dynamic
  http
  upgrade
  router
  upgrade
  compiler-cli
  benchpress)
 BUILD_ALL=true
 BUNDLE=true
 VERSION_PREFIX=$(node -p "require('./package.json').version")
 VERSION_SUFFIX="-$(git log --oneline -1 | awk '{print $1}')"
 ROUTER_VERSION_PREFIX=$(node -p "require('./package.json').version.replace(/^2/, '3')")
 REMOVE_BENCHPRESS=false
 for ARG in "$@"; do
  case "$ARG" in
@ -35,10 +31,6 @@ for ARG in "$@"; do
    --bundle=*)
      BUNDLE=( "${ARG#--bundle=}" )
      ;;
    --publish)
      VERSION_SUFFIX=""
      REMOVE_BENCHPRESS=true
      ;;
    *)
      echo "Unknown option $ARG."
      exit 1
@ -46,10 +38,6 @@ for ARG in "$@"; do
  esac
 done
 VERSION="${VERSION_PREFIX}${VERSION_SUFFIX}"
 ROUTER_VERSION="${ROUTER_VERSION_PREFIX}${VERSION_SUFFIX}"
 echo "====== BUILDING: Version ${VERSION} (Router ${ROUTER_VERSION})"
 export NODE_PATH=${NODE_PATH}:$(pwd)/dist/all:$(pwd)/dist/tools
 TSC="node --max-old-space-size=3000 dist/tools/@angular/tsc-wrapped/src/main"
 UGLIFYJS=`pwd`/node_modules/.bin/uglifyjs
@ -75,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 ====="
@ -91,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 .
@ -113,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}/
@ -184,49 +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
  (
    echo "======      VERSION: Updating version references"
    cd ${DESTDIR}
    echo "======       EXECUTE: perl -p -i -e \"s/0\.0\.0\-PLACEHOLDER/${VERSION}/g\" $""(grep -ril 0\.0\.0\-PLACEHOLDER .)"
    perl -p -i -e "s/0\.0\.0\-PLACEHOLDER/${VERSION}/g" $(grep -ril 0\.0\.0\-PLACEHOLDER .) < /dev/null 2> /dev/null
    echo "======       EXECUTE: perl -p -i -e \"s/0\.0\.0\-ROUTERPLACEHOLDER/${ROUTER_VERSION}/g\" $""(grep -ril 0\.0\.0\-ROUTERPLACEHOLDER .)"
    perl -p -i -e "s/0\.0\.0\-ROUTERPLACEHOLDER/${ROUTER_VERSION}/g" $(grep -ril 0\.0\.0\-ROUTERPLACEHOLDER .) < /dev/null 2> /dev/null
  )
 done
 echo ""
 echo "====== Building examples: ./modules/@angular/examples/build.sh ====="
 ./modules/@angular/examples/build.sh
 if [[ ${REMOVE_BENCHPRESS} == true ]]; then
  echo ""
  echo "==== Removing benchpress from publication"
  rm -r dist/packages-dist/benchpress
 fi
--- a/circle.yml
+++ b/circle.yml
@ -4,7 +4,7 @@ machine:
 dependencies:
  pre:
-    - npm install -g npm@3.6.0
+    - npm install -g npm
 test:
  override:
--- a/gulpfile.js
+++ b/gulpfile.js
@ -58,7 +58,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',
@ -125,31 +124,38 @@ gulp.task('public-api:update', ['build.sh'], (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
      .src([
        // todo(vicb): add .js files when supported
        // see https://github.com/palantir/tslint/pull/1515
-        './modules/**/*.ts',
+        'modules/@angular/**/*.ts',
-        './tools/**/*.ts',
+        'modules/benchpress/**/*.ts',
        './*.ts',
        // 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,
        rulesDirectory: 'dist/tools/tslint',
        formatter: 'prose',
      }))
      .pipe(tslint.report({emitError: true}));
--- a/karma-js.conf.js
+++ b/karma-js.conf.js
@ -23,7 +23,7 @@ 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/proxy.js', 'node_modules/zone.js/dist/sync-test.js',
@ -90,17 +90,17 @@ module.exports = function(config) {
      project: 'Angular2',
      startTunnel: false,
      retryLimit: 3,
-      timeout: 1800,
+      timeout: 600,
      pollingTimeout: 10000,
    },
    browsers: ['Chrome'],
    port: 9876,
-    captureTimeout: 180000,
+    captureTimeout: 60000,
-    browserDisconnectTimeout: 180000,
+    browserDisconnectTimeout: 60000,
    browserDisconnectTolerance: 3,
-    browserNoActivityTimeout: 300000,
+    browserNoActivityTimeout: 60000,
  });
  if (process.env.TRAVIS) {
--- 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
@ -55,9 +55,9 @@ 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]; }); });
  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
@ -33,12 +33,12 @@ 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 = Object.keys(this._userMetrics);
    function getAndClearValues() {
      Promise.all(names.map(name => adapter.executeScript(`return window.${name}`)))
@ -46,7 +46,7 @@ export class UserMetric extends Metric {
            if (values.every(v => typeof v === 'number')) {
              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
@ -28,8 +28,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 +49,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 +61,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
@ -38,7 +38,7 @@ 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,
          'stats': stats,
@ -46,7 +46,7 @@ export class JsonFileReporter extends Reporter {
          'validSample': validSample,
        },
        null, 2);
-    const filePath = `${this._path}/${this._description.id}_${this._now().getTime()}.json`;
+    var 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
@ -18,10 +18,10 @@ export function sortedProps(obj: {[key: string]: any}) {
 }
 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)}%`;
--- a/modules/@angular/benchpress/src/runner.ts
+++ b/modules/@angular/benchpress/src/runner.ts
@ -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/sampler.ts
+++ b/modules/@angular/benchpress/src/sampler.ts
@ -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
@ -12,14 +12,14 @@ export class Statistic {
  }
  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 +30,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
@ -34,7 +34,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,7 +43,7 @@ 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;
@ -101,4 +101,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,7 +168,7 @@ 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);
    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
@ -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 + '");';
    }
--- a/modules/@angular/benchpress/src/webdriver/ios_driver_extension.ts
+++ b/modules/@angular/benchpress/src/webdriver/ios_driver_extension.ts
@ -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,9 +39,9 @@ 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') {
              records.push(message['params']['record']);
            }
@ -56,13 +56,13 @@ export class IOsDriverExtension extends WebDriverExtension {
      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 (type === 'FunctionCall' && (isBlank(data) || data['scriptName'] !== 'InjectedScript')) {
        events.push(createStartEvent('script', startTime));
        endEvent = createEndEvent('script', endTime);
      } else if (type === 'Time') {
@ -95,7 +95,7 @@ export class IOsDriverExtension extends WebDriverExtension {
 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,12 +6,9 @@
 * found in the LICENSE file at https://angular.io/license
 */
-/* tslint:disable:no-console  */
+var assertEventsContainsName = function(events: any[], eventName: string) {
-import {browser} from 'protractor';
+  var found = false;
-
+  for (var i = 0; i < events.length; ++i) {
 const assertEventsContainsName = function(events: any[], eventName: string) {
  let found = false;
  for (let i = 0; i < events.length; ++i) {
    if (events[i].name == eventName) {
      found = true;
      break;
@ -21,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
@ -11,12 +11,12 @@ 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 => ({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
@ -14,8 +14,8 @@ import {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,
@ -34,7 +34,7 @@ export function main() {
    if (!microMetrics) {
      microMetrics = {};
    }
-    const providers: Provider[] = [
+    var providers: Provider[] = [
      Options.DEFAULT_PROVIDERS, PerflogMetric.PROVIDERS,
      {provide: Options.MICRO_METRICS, useValue: microMetrics}, {
        provide: PerflogMetric.SET_TIMEOUT,
@ -66,7 +66,7 @@ export function main() {
  describe('perflog metric', () => {
    function sortedKeys(stringMap: {[key: string]: any}) {
-      const res: string[] = [];
+      var res: string[] = [];
      res.push(...Object.keys(stringMap));
      res.sort();
      return res;
@ -102,15 +102,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 +118,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 +131,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 +141,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 +155,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 +172,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 +187,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 +195,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 +211,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 +219,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 +233,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 +244,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 +263,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 +276,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 +291,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 +313,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 +502,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 +685,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
@ -12,7 +12,7 @@ import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/te
 import {Options, PerfLogEvent, PerfLogFeatures, UserMetric, WebDriverAdapter} from '../../index';
 export function main() {
-  let wdAdapter: MockDriverAdapter;
+  var wdAdapter: MockDriverAdapter;
  function createMetric(
      perfLogs: PerfLogEvent[], perfLogFeatures: PerfLogFeatures,
@ -25,7 +25,7 @@ export function main() {
      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 +45,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 +71,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
@ -14,8 +14,8 @@ import {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}: {
@ -28,10 +28,10 @@ export function main() {
      if (!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)
--- a/modules/@angular/benchpress/test/reporter/json_file_reporter_spec.ts
+++ b/modules/@angular/benchpress/test/reporter/json_file_reporter_spec.ts
@ -13,7 +13,7 @@ import {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,7 +21,7 @@ export function main() {
      metrics: {[key: string]: string},
      path: string
    }) {
-      const providers = [
+      var providers = [
        JsonFileReporter.PROVIDERS, {
          provide: SampleDescription,
          useValue: new SampleDescription(sampleId, descriptions, metrics)
@ -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',
--- a/modules/@angular/benchpress/test/reporter/multi_reporter_spec.ts
+++ b/modules/@angular/benchpress/test/reporter/multi_reporter_spec.ts
@ -12,12 +12,12 @@ import {MeasureValues, MultiReporter, ReflectiveInjector, Reporter} from '../../
 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 => ({provide: id, useValue: new MockReporter(id)})),
-                    MultiReporter.provideWith(ids)
+                  MultiReporter.provideWith(ids)
-                  ])
+                ])
-                  .get(MultiReporter);
+                .get(MultiReporter);
    return Promise.resolve(r);
  }
@ -25,7 +25,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, new Date(), {});
         createReporters(['m1', 'm2']).then((r) => r.reportMeasureValues(mv)).then((values) => {
           expect(values).toEqual([{'id': 'm1', 'values': mv}, {'id': 'm2', 'values': mv}]);
@ -34,9 +34,9 @@ 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(), {})];
-         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
@ -12,8 +12,8 @@ import {Injector, Metric, Options, ReflectiveInjector, Runner, SampleDescription
 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) {
@ -76,7 +76,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 +85,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
@ -12,10 +12,10 @@ import {MeasureValues, Metric, Options, ReflectiveInjector, Reporter, Sampler, V
 import {isBlank, isPresent} 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,7 +25,7 @@ export function main() {
      prepare?: any,
      execute?: any
    } = {}) {
-      let time = 1000;
+      var time = 1000;
      if (!metric) {
        metric = new MockMetric([]);
      }
@ -35,7 +35,7 @@ export function main() {
      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},
@ -50,10 +50,10 @@ 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);
         });
@ -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(),
@ -220,7 +220,7 @@ function createCountingValidator(
 }
 function createCountingMetric(log: any[] = []) {
-  let scriptTime = 0;
+  var scriptTime = 0;
  return new MockMetric(log, () => ({'script': scriptTime++}));
 }
@ -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/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
@ -9,10 +9,11 @@
 import {describe, expect, it} from '@angular/core/testing/testing_internal';
 import {MeasureValues, ReflectiveInjector, RegressionSlopeValidator} from '../../index';
 import {ListWrapper} from '../../src/facade/collection';
 export function main() {
  describe('regression slope validator', () => {
-    let validator: RegressionSlopeValidator;
+    var validator: RegressionSlopeValidator;
    function createValidator({size, metric}: {size: number, metric: string}) {
      validator = ReflectiveInjector
@ -42,16 +43,18 @@ 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));
    });
  });
--- a/modules/@angular/benchpress/test/validator/size_validator_spec.ts
+++ b/modules/@angular/benchpress/test/validator/size_validator_spec.ts
@ -9,10 +9,11 @@
 import {describe, expect, it} from '@angular/core/testing/testing_internal';
 import {MeasureValues, ReflectiveInjector, SizeValidator} from '../../index';
 import {ListWrapper} from '../../src/facade/collection';
 export function main() {
  describe('size validator', () => {
-    let validator: SizeValidator;
+    var validator: SizeValidator;
    function createValidator(size: number) {
      validator =
@ -35,9 +36,10 @@ 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));
    });
  });
--- a/modules/@angular/benchpress/test/webdriver/chrome_driver_extension_spec.ts
+++ b/modules/@angular/benchpress/test/webdriver/chrome_driver_extension_spec.ts
@ -14,23 +14,23 @@ 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,
@ -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([
--- a/modules/@angular/benchpress/test/webdriver/ios_driver_extension_spec.ts
+++ b/modules/@angular/benchpress/test/webdriver/ios_driver_extension_spec.ts
@ -13,10 +13,10 @@ 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) {
--- 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_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
--- 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 = {};
 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();
    }
  }
 }
 /**
@ -76,52 +64,92 @@ 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;
+    // Set of views to display for this value
-    if (this._caseCount === 0) {
+    let views = this._valueViews.get(value);
      this._updateDefaultCases(true);
    }
  }
-  /** @internal */
+    if (views) {
-  _addCase(): number { return this._caseCount++; }
+      this._useDefault = false;
-
+    } else {
-  /** @internal */
+      // No view to display for the current value -> default case
-  _addDefault(view: SwitchView) {
+      // Nothing to do if the default case was already active
-    if (!this._defaultViews) {
+      if (this._useDefault) {
-      this._defaultViews = [];
+        return;
    }
    this._defaultViews.push(view);
  }
  /** @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);
      }
      this._useDefault = true;
      views = this._valueViews.get(_CASE_DEFAULT);
    }
    this._emptyAllActiveViews();
    this._activateViews(views);
    this._switchValue = value;
  }
  /** @internal */
  _onCaseValueChanged(oldCase: any, newCase: any, view: SwitchView): void {
    this._deregisterView(oldCase, view);
    this._registerView(newCase, view);
    if (oldCase === this._switchValue) {
      view.destroy();
      ListWrapper.remove(this._activeViews, view);
    } else if (newCase === this._switchValue) {
      if (this._useDefault) {
        this._useDefault = false;
        this._emptyAllActiveViews();
      }
      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 +179,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 +226,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/async_pipe.ts
+++ b/modules/@angular/common/src/pipes/async_pipe.ts
@ -59,7 +59,7 @@ const _observableStrategy = new ObservableStrategy();
 * {@example common/pipes/ts/async_pipe.ts region='AsyncPipePromise'}
 *
 * It's also possible to use `async` with Observables. The example below binds the `time` Observable
- * to the view. The Observable continuously updates the view with the current time.
+ * to the view. The Observable continuesly updates the view with the current time.
 *
 * {@example common/pipes/ts/async_pipe.ts region='AsyncPipeObservable'}
 *
--- 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_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} 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 (typeof mapping !== 'object' || mapping === null) {
      throw new InvalidPipeArgumentError(I18nSelectPipe, mapping);
    }
-    if (mapping.hasOwnProperty(value)) {
+    return mapping[value] || '';
      return mapping[value];
    }
    if (mapping.hasOwnProperty('other')) {
      return mapping['other'];
    }
    return '';
  }
 }
--- 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, describe, expect, it} 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,93 @@ 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', () => {
+      it('should switch amongst when values with fallback to default', async(() => {
-        const template = '<div>' +
+           const template = '<div>' +
-            '<ul [ngSwitch]="switchValue">' +
+               '<ul [ngSwitch]="switchValue">' +
-            '<li template="ngSwitchCase \'a\'">when a</li>' +
+               '<li template="ngSwitchCase \'a\'">when a</li>' +
-            '<li template="ngSwitchDefault">when default</li>' +
+               '<li template="ngSwitchDefault">when default</li>' +
-            '</ul></div>';
+               '</ul></div>';
-        fixture = createTestComponent(template);
+           fixture = createTestComponent(template);
-        detectChangesAndExpectText('when default');
+           detectChangesAndExpectText('when default');
-        getComponent().switchValue = 'a';
+           getComponent().switchValue = 'a';
-        detectChangesAndExpectText('when a');
+           detectChangesAndExpectText('when a');
-        getComponent().switchValue = 'b';
+           getComponent().switchValue = 'b';
-        detectChangesAndExpectText('when default');
+           detectChangesAndExpectText('when default');
-        getComponent().switchValue = 'c';
+           getComponent().switchValue = 'c';
-        detectChangesAndExpectText('when default');
+           detectChangesAndExpectText('when default');
-      });
+         }));
-      it('should support multiple whens with the same value', () => {
+      it('should support multiple whens with the same value', async(() => {
-        const template = '<div>' +
+           const template = '<div>' +
-            '<ul [ngSwitch]="switchValue">' +
+               '<ul [ngSwitch]="switchValue">' +
-            '<template ngSwitchCase="a"><li>when a1;</li></template>' +
+               '<template ngSwitchCase="a"><li>when a1;</li></template>' +
-            '<template ngSwitchCase="b"><li>when b1;</li></template>' +
+               '<template ngSwitchCase="b"><li>when b1;</li></template>' +
-            '<template ngSwitchCase="a"><li>when a2;</li></template>' +
+               '<template ngSwitchCase="a"><li>when a2;</li></template>' +
-            '<template ngSwitchCase="b"><li>when b2;</li></template>' +
+               '<template ngSwitchCase="b"><li>when b2;</li></template>' +
-            '<template ngSwitchDefault><li>when default1;</li></template>' +
+               '<template ngSwitchDefault><li>when default1;</li></template>' +
-            '<template ngSwitchDefault><li>when default2;</li></template>' +
+               '<template ngSwitchDefault><li>when default2;</li></template>' +
-            '</ul></div>';
+               '</ul></div>';
-        fixture = createTestComponent(template);
+           fixture = createTestComponent(template);
-        detectChangesAndExpectText('when default1;when default2;');
+           detectChangesAndExpectText('when default1;when default2;');
-        getComponent().switchValue = 'a';
+           getComponent().switchValue = 'a';
-        detectChangesAndExpectText('when a1;when a2;');
+           detectChangesAndExpectText('when a1;when a2;');
-        getComponent().switchValue = 'b';
+           getComponent().switchValue = 'b';
-        detectChangesAndExpectText('when b1;when b2;');
+           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/pipes/async_pipe_spec.ts
+++ b/modules/@angular/common/test/pipes/async_pipe_spec.ts
@ -19,10 +19,10 @@ 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 +62,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 +104,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 = (getDOM() && browserDetection.isIE) ? 50 : 10;
      beforeEach(() => {
        promise = new Promise((res, rej) => {
@ -154,7 +154,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 +168,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 +202,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,13 @@
 import {DatePipe} from '@angular/common';
 import {PipeResolver} from '@angular/compiler/src/pipe_resolver';
 import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal';
 import {browserDetection} from '@angular/platform-browser/testing/browser_util';
 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
@ -39,9 +34,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 +42,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
@ -12,10 +12,10 @@ import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_in
 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 {beforeEach, describe, expect, it} 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
@ -13,10 +13,10 @@ import {expect} from '@angular/platform-browser/testing/matchers';
 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, ''); }
@ -39,14 +39,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, null, 2));
        expect(dream1).toEqual(dream2);
      });
    });
@ -63,8 +63,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]');
--- a/modules/@angular/common/test/pipes/lowercase_pipe_spec.ts
+++ b/modules/@angular/common/test/pipes/lowercase_pipe_spec.ts
@ -11,9 +11,9 @@ import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_in
 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
@ -13,7 +13,7 @@ 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
@ -13,9 +13,9 @@ 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 +93,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
@ -11,9 +11,9 @@ import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_in
 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/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/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,7 +34,6 @@ 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>
@ -44,10 +43,6 @@ const EXPECTED_XLIFF = `<?xml version="1.0" encoding="UTF-8" ?>
 <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
  <file source-language="en" datatype="plaintext" original="ng2.template">
    <body>
      <trans-unit id="63a85808f03b8181e36a952e0fa38202c2304862" datatype="html">
        <source>other-3rdP-component</source>
        <target/>
      </trans-unit>
      <trans-unit id="76e1eccb1b772fa9f294ef9c146ea6d0efa8a2d4" datatype="html">
        <source>translate me</source>
        <target/>
--- 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/modules/@angular/compiler-cli/integrationtest/test/projection_spec.ts
+++ b/modules/@angular/compiler-cli/integrationtest/test/projection_spec.ts
@ -13,10 +13,10 @@ import {createComponent} from './util';
 describe('content projection', () => {
  it('should support basic content projection', () => {
-    const mainCompFixture = createComponent(ProjectingComp);
+    var mainCompFixture = createComponent(ProjectingComp);
-    const debugElement = mainCompFixture.debugElement;
+    var debugElement = mainCompFixture.debugElement;
-    const compWithProjection = debugElement.query(By.directive(CompWithNgContent));
+    var compWithProjection = debugElement.query(By.directive(CompWithNgContent));
    expect(compWithProjection.children.length).toBe(1);
    expect(compWithProjection.children[0].attributes['greeting']).toEqual('Hello world!');
  });
--- a/modules/@angular/compiler-cli/integrationtest/test/query_spec.ts
+++ b/modules/@angular/compiler-cli/integrationtest/test/query_spec.ts
@ -14,18 +14,18 @@ import {createComponent} from './util';
 describe('child queries', () => {
  it('should support compiling child queries', () => {
-    const childQueryCompFixture = createComponent(CompWithChildQuery);
+    var childQueryCompFixture = createComponent(CompWithChildQuery);
-    const debugElement = childQueryCompFixture.debugElement;
+    var debugElement = childQueryCompFixture.debugElement;
-    const compWithChildren = debugElement.query(By.directive(CompWithChildQuery));
+    var compWithChildren = debugElement.query(By.directive(CompWithChildQuery));
    expect(childQueryCompFixture.componentInstance.child).toBeDefined();
    expect(childQueryCompFixture.componentInstance.child instanceof CompForChildQuery).toBe(true);
  });
  it('should support compiling children queries', () => {
-    const childQueryCompFixture = createComponent(CompWithChildQuery);
+    var childQueryCompFixture = createComponent(CompWithChildQuery);
-    const debugElement = childQueryCompFixture.debugElement;
+    var debugElement = childQueryCompFixture.debugElement;
-    const compWithChildren = debugElement.query(By.directive(CompWithChildQuery));
+    var compWithChildren = debugElement.query(By.directive(CompWithChildQuery));
    childQueryCompFixture.detectChanges();
--- a/modules/@angular/compiler-cli/integrationtest/third_party_src/README.md
+++ b/modules/@angular/compiler-cli/integrationtest/third_party_src/README.md
@ -1,8 +0,0 @@
 This folder emulates consuming precompiled modules and components.
 It is compiled separately from the other sources under `src`
 to only generate `*.js` / `*.d.ts` / `*.metadata.json` files,
 but no `*.ngfactory.ts` files.
 ** WARNING **
 Do not import components/directives from here directly as we want to test that ngc still compiles 
 them when they are not imported.
--- a/modules/@angular/compiler-cli/integrationtest/third_party_src/directive.ts
+++ b/modules/@angular/compiler-cli/integrationtest/third_party_src/directive.ts
@ -1,17 +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 {Directive, Input} from '@angular/core';
@Directive({
  selector: '[thirdParty]',
  host: {'[title]': 'thirdParty'},
 })
 export class ThirdPartyDirective {
  @Input() thirdParty: string;
 }
--- a/modules/@angular/compiler-cli/integrationtest/third_party_src/module.ts
+++ b/modules/@angular/compiler-cli/integrationtest/third_party_src/module.ts
@ -1,28 +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 {NgModule} from '@angular/core';
 import {ThirdPartyComponent} from './comp';
 import {ThirdPartyDirective} from './directive';
 import {AnotherThirdPartyModule} from './other_module';
@NgModule({
  declarations: [
    ThirdPartyComponent,
    ThirdPartyDirective,
  ],
  exports: [
    AnotherThirdPartyModule,
    ThirdPartyComponent,
    ThirdPartyDirective,
  ],
  imports: [AnotherThirdPartyModule]
 })
 export class ThirdpartyModule {
 }
--- a/modules/@angular/compiler-cli/integrationtest/third_party_src/other_comp.ts
+++ b/modules/@angular/compiler-cli/integrationtest/third_party_src/other_comp.ts
@ -1,16 +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: 'another-third-party-comp',
  template: '<div i18n>other-3rdP-component</div>',
 })
 export class AnotherThirdpartyComponent {
 }
--- a/modules/@angular/compiler-cli/integrationtest/third_party_src/other_module.ts
+++ b/modules/@angular/compiler-cli/integrationtest/third_party_src/other_module.ts
@ -1,17 +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 {NgModule} from '@angular/core';
 import {AnotherThirdpartyComponent} from './other_comp';
@NgModule({
  declarations: [AnotherThirdpartyComponent],
  exports: [AnotherThirdpartyComponent],
 })
 export class AnotherThirdPartyModule {
 }
--- a/modules/@angular/compiler-cli/integrationtest/third_party_src/tsconfig-build.json
+++ b/modules/@angular/compiler-cli/integrationtest/third_party_src/tsconfig-build.json
@ -1,20 +0,0 @@
 {
  "angularCompilerOptions": {
    // For TypeScript 1.8, we have to lay out generated files
    // in the same source directory with your code.
    "genDir": ".",
    "debug": true
  },
  "compilerOptions": {
    "target": "es5",
    "experimentalDecorators": true,
    "noImplicitAny": true,
    "moduleResolution": "node",
    "rootDir": "",
    "declaration": true,
    "lib": ["es6", "dom"],
    "baseUrl": ".",
    "outDir": "../node_modules/third_party"
  }
 }
--- a/modules/@angular/compiler-cli/integrationtest/tsconfig-build.json
+++ b/modules/@angular/compiler-cli/integrationtest/tsconfig-build.json
@ -1,29 +0,0 @@
 {
  "angularCompilerOptions": {
    // For TypeScript 1.8, we have to lay out generated files
    // in the same source directory with your code.
    "genDir": ".",
    "debug": true
  },
  "compilerOptions": {
    "target": "es5",
    "experimentalDecorators": true,
    "noImplicitAny": true,
    "moduleResolution": "node",
    "rootDir": "",
    "declaration": true,
    "lib": ["es6", "dom"],
    "baseUrl": "."
  },
  "files": [
    "src/module",
    "src/bootstrap",
    "test/all_spec",
    "benchmarks/src/tree/ng2/index_aot.ts",
    "benchmarks/src/tree/ng2_switch/index_aot.ts",
    "benchmarks/src/largetable/ng2/index_aot.ts",
    "benchmarks/src/largetable/ng2_switch/index_aot.ts"
  ]
 }
--- a/modules/@angular/compiler-cli/integrationtest/tsconfig.json
+++ b/modules/@angular/compiler-cli/integrationtest/tsconfig.json
@ -0,0 +1,29 @@
 {
    "angularCompilerOptions": {
      // For TypeScript 1.8, we have to lay out generated files
      // in the same source directory with your code.
      "genDir": ".",
      "debug": true
    },
    "compilerOptions": {
        "target": "es5",
        "experimentalDecorators": true,
        "noImplicitAny": true,
        "moduleResolution": "node",
        "rootDir": "",
        "declaration": true,
        "lib": ["es6", "dom"],
        "baseUrl": "."
    },
    "files": [
        "src/module",
        "src/bootstrap",
        "test/all_spec",
        "benchmarks/src/tree/ng2/index_aot.ts",
        "benchmarks/src/tree/ng2_switch/index_aot.ts",
        "benchmarks/src/largetable/ng2/index_aot.ts",
        "benchmarks/src/largetable/ng2_switch/index_aot.ts"
    ]
 }
--- a/modules/@angular/compiler-cli/src/codegen.ts
+++ b/modules/@angular/compiler-cli/src/codegen.ts
@ -11,9 +11,8 @@
 * Intended to be used in a build step.
 */
 import * as compiler from '@angular/compiler';
-import {ViewEncapsulation} from '@angular/core';
+import {Directive, NgModule, ViewEncapsulation} from '@angular/core';
 import {AngularCompilerOptions, NgcCliOptions} from '@angular/tsc-wrapped';
 import {readFileSync} from 'fs';
 import * as path from 'path';
 import * as ts from 'typescript';
@ -23,30 +22,88 @@ import {ReflectorHost, ReflectorHostContext} from './reflector_host';
 import {StaticAndDynamicReflectionCapabilities} from './static_reflection_capabilities';
 import {StaticReflector, StaticReflectorHost, StaticSymbol} from './static_reflector';
 const nodeFs = require('fs');
 const GENERATED_FILES = /\.ngfactory\.ts$|\.css\.ts$|\.css\.shim\.ts$/;
 const GENERATED_OR_DTS_FILES = /\.d\.ts$|\.ngfactory\.ts$|\.css\.ts$|\.css\.shim\.ts$/;
 const PREAMBLE = `/**
- * @fileoverview This file is generated by the Angular 2 template compiler.
+ * This file is generated by the Angular 2 template compiler.
 * Do not edit.
 * @suppress {suspiciousCode,uselessCode,missingProperties}
 */
 /* tslint:disable */
 `;
 export class CodeGeneratorModuleCollector {
  constructor(
      private staticReflector: StaticReflector, private reflectorHost: StaticReflectorHost,
      private program: ts.Program, private options: AngularCompilerOptions) {}
  getModuleSymbols(program: ts.Program): {fileMetas: FileMetadata[], ngModules: StaticSymbol[]} {
    // Compare with false since the default should be true
    const skipFileNames = (this.options.generateCodeForLibraries === false) ?
        GENERATED_OR_DTS_FILES :
        GENERATED_FILES;
    let filePaths = this.program.getSourceFiles()
                        .filter(sf => !skipFileNames.test(sf.fileName))
                        .map(sf => this.reflectorHost.getCanonicalFileName(sf.fileName));
    const fileMetas = filePaths.map((filePath) => this.readFileMetadata(filePath));
    const ngModules = fileMetas.reduce((ngModules, fileMeta) => {
      ngModules.push(...fileMeta.ngModules);
      return ngModules;
    }, <StaticSymbol[]>[]);
    return {fileMetas, ngModules};
  }
  private readFileMetadata(absSourcePath: string): FileMetadata {
    const moduleMetadata = this.staticReflector.getModuleMetadata(absSourcePath);
    const result: FileMetadata = {directives: [], ngModules: [], fileUrl: absSourcePath};
    if (!moduleMetadata) {
      console.log(`WARNING: no metadata found for ${absSourcePath}`);
      return result;
    }
    const metadata = moduleMetadata['metadata'];
    const symbols = metadata && Object.keys(metadata);
    if (!symbols || !symbols.length) {
      return result;
    }
    for (const symbol of symbols) {
      if (metadata[symbol] && metadata[symbol].__symbolic == 'error') {
        // Ignore symbols that are only included to record error information.
        continue;
      }
      const staticType = this.reflectorHost.findDeclaration(absSourcePath, symbol, absSourcePath);
      const annotations = this.staticReflector.annotations(staticType);
      annotations.forEach((annotation) => {
        if (annotation instanceof NgModule) {
          result.ngModules.push(staticType);
        } else if (annotation instanceof Directive) {
          result.directives.push(staticType);
        }
      });
    }
    return result;
  }
 }
 export class CodeGenerator {
  private moduleCollector: CodeGeneratorModuleCollector;
  constructor(
      private options: AngularCompilerOptions, private program: ts.Program,
      public host: ts.CompilerHost, private staticReflector: StaticReflector,
-      private compiler: compiler.OfflineCompiler, private reflectorHost: StaticReflectorHost) {}
+      private compiler: compiler.OfflineCompiler, private reflectorHost: StaticReflectorHost) {
    this.moduleCollector =
        new CodeGeneratorModuleCollector(staticReflector, reflectorHost, program, options);
  }
  // Write codegen in a directory structure matching the sources.
  private calculateEmitPath(filePath: string): string {
    let root = this.options.basePath;
-    for (const eachRootDir of this.options.rootDirs || []) {
+    for (let eachRootDir of this.options.rootDirs || []) {
      if (this.options.trace) {
-        console.error(`Check if ${filePath} is under rootDirs element ${eachRootDir}`);
+        console.log(`Check if ${filePath} is under rootDirs element ${eachRootDir}`);
      }
      if (path.relative(eachRootDir, filePath).indexOf('.') !== 0) {
        root = eachRootDir;
@ -54,28 +111,31 @@ export class CodeGenerator {
    }
    // transplant the codegen path to be inside the `genDir`
-    let relativePath: string = path.relative(root, filePath);
+    var relativePath: string = path.relative(root, filePath);
    while (relativePath.startsWith('..' + path.sep)) {
      // Strip out any `..` path such as: `../node_modules/@foo` as we want to put everything
      // into `genDir`.
      relativePath = relativePath.substr(3);
    }
    return path.join(this.options.genDir, relativePath);
  }
-  codegen(options: {transitiveModules: boolean}): Promise<any> {
+  codegen(): Promise<any> {
-    const staticSymbols =
+    const {fileMetas, ngModules} = this.moduleCollector.getModuleSymbols(this.program);
-        extractProgramSymbols(this.program, this.staticReflector, this.reflectorHost, this.options);
+    const analyzedNgModules = this.compiler.analyzeModules(ngModules);
-
+    return Promise.all(fileMetas.map(
-    return this.compiler.compileModules(staticSymbols, options).then(generatedModules => {
+        (fileMeta) =>
-      generatedModules.forEach(generatedModule => {
+            this.compiler
-        const sourceFile = this.program.getSourceFile(generatedModule.fileUrl);
+                .compile(
-        const emitPath = this.calculateEmitPath(generatedModule.moduleUrl);
+                    fileMeta.fileUrl, analyzedNgModules, fileMeta.directives, fileMeta.ngModules)
-        this.host.writeFile(
+                .then((generatedModules) => {
-            emitPath, PREAMBLE + generatedModule.source, false, () => {}, [sourceFile]);
+                  generatedModules.forEach((generatedModule) => {
-      });
+                    const sourceFile = this.program.getSourceFile(fileMeta.fileUrl);
-    });
+                    const emitPath = this.calculateEmitPath(generatedModule.moduleUrl);
                    this.host.writeFile(
                        emitPath, PREAMBLE + generatedModule.source, false, () => {}, [sourceFile]);
                  });
                })));
  }
  static create(
@ -99,7 +159,7 @@ export class CodeGenerator {
        throw new Error(
            `The translation file (${transFile}) locale must be provided. Use the --locale option.`);
      }
-      transContent = readFileSync(transFile, 'utf8');
+      transContent = nodeFs.readFileSync(transFile, 'utf8');
    }
    const urlResolver: compiler.UrlResolver = compiler.createOfflineCompileUrlResolver();
@ -129,56 +189,21 @@ export class CodeGenerator {
    const resolver = new compiler.CompileMetadataResolver(
        new compiler.NgModuleResolver(staticReflector),
        new compiler.DirectiveResolver(staticReflector), new compiler.PipeResolver(staticReflector),
-        elementSchemaRegistry, normalizer, staticReflector);
+        elementSchemaRegistry, staticReflector);
    // TODO(vicb): do not pass cliOptions.i18nFormat here
    const offlineCompiler = new compiler.OfflineCompiler(
-        resolver, tmplParser, new compiler.StyleCompiler(urlResolver),
+        resolver, normalizer, tmplParser, new compiler.StyleCompiler(urlResolver),
-        new compiler.ViewCompiler(config, elementSchemaRegistry),
+        new compiler.ViewCompiler(config), new compiler.DirectiveWrapperCompiler(config),
        new compiler.DirectiveWrapperCompiler(
            config, expressionParser, elementSchemaRegistry, console),
        new compiler.NgModuleCompiler(), new compiler.TypeScriptEmitter(reflectorHost),
-        cliOptions.locale, cliOptions.i18nFormat,
+        cliOptions.locale, cliOptions.i18nFormat);
        new compiler.AnimationParser(elementSchemaRegistry));
    return new CodeGenerator(
        options, program, compilerHost, staticReflector, offlineCompiler, reflectorHost);
  }
 }
-export function extractProgramSymbols(
+export interface FileMetadata {
-    program: ts.Program, staticReflector: StaticReflector, reflectorHost: StaticReflectorHost,
+  fileUrl: string;
-    options: AngularCompilerOptions): StaticSymbol[] {
+  directives: StaticSymbol[];
-  // Compare with false since the default should be true
+  ngModules: StaticSymbol[];
  const skipFileNames =
      options.generateCodeForLibraries === false ? GENERATED_OR_DTS_FILES : GENERATED_FILES;
  const staticSymbols: StaticSymbol[] = [];
  program.getSourceFiles()
      .filter(sourceFile => !skipFileNames.test(sourceFile.fileName))
      .forEach(sourceFile => {
        const absSrcPath = reflectorHost.getCanonicalFileName(sourceFile.fileName);
        const moduleMetadata = staticReflector.getModuleMetadata(absSrcPath);
        if (!moduleMetadata) {
          console.warn(`WARNING: no metadata found for ${absSrcPath}`);
          return;
        }
        const metadata = moduleMetadata['metadata'];
        if (!metadata) {
          return;
        }
        for (const symbol of Object.keys(metadata)) {
          if (metadata[symbol] && metadata[symbol].__symbolic == 'error') {
            // Ignore symbols that are only included to record error information.
            continue;
          }
          staticSymbols.push(reflectorHost.findDeclaration(absSrcPath, symbol, absSrcPath));
        }
      });
  return staticSymbols;
 }
--- a/modules/@angular/compiler-cli/src/extract_i18n.ts
+++ b/modules/@angular/compiler-cli/src/extract_i18n.ts
@ -10,32 +10,27 @@
 /**
 * Extract i18n messages from source code
 *
 * TODO(vicb): factorize code with the CodeGenerator
 */
 // Must be imported first, because angular2 decorators throws on load.
 import 'reflect-metadata';
 import * as compiler from '@angular/compiler';
-import * as tsc from '@angular/tsc-wrapped';
+import {Component, NgModule, ViewEncapsulation} from '@angular/core';
 import * as path from 'path';
 import * as ts from 'typescript';
-
+import * as tsc from '@angular/tsc-wrapped';
-import {Extractor} from './extractor';
+import {Console} from './private_import_core';
 import {ReflectorHost, ReflectorHostContext} from './reflector_host';
 import {StaticAndDynamicReflectionCapabilities} from './static_reflection_capabilities';
 import {StaticReflector, StaticSymbol} from './static_reflector';
 function extract(
    ngOptions: tsc.AngularCompilerOptions, cliOptions: tsc.I18nExtractionCliOptions,
    program: ts.Program, host: ts.CompilerHost) {
-  const resourceLoader: compiler.ResourceLoader = {
+  const htmlParser = new compiler.I18NHtmlParser(new compiler.HtmlParser());
-    get: (s: string) => {
+  const extractor = Extractor.create(ngOptions, cliOptions.i18nFormat, program, host, htmlParser);
      if (!host.fileExists(s)) {
        // TODO: We should really have a test for error cases like this!
        throw new Error(`Compilation failed. Resource file not found: ${s}`);
      }
      return Promise.resolve(host.readFile(s));
    }
  };
  const extractor =
      Extractor.create(ngOptions, cliOptions.i18nFormat, program, host, resourceLoader);
  const bundlePromise: Promise<compiler.MessageBundle> = extractor.extract();
  return (bundlePromise).then(messageBundle => {
@ -51,7 +46,6 @@ function extract(
      case 'xliff':
      case 'xlf':
      default:
        const htmlParser = new compiler.I18NHtmlParser(new compiler.HtmlParser());
        ext = 'xlf';
        serializer = new compiler.Xliff(htmlParser, compiler.DEFAULT_INTERPOLATION_CONFIG);
        break;
@ -62,6 +56,139 @@ function extract(
  });
 }
 const GENERATED_FILES = /\.ngfactory\.ts$|\.css\.ts$|\.css\.shim\.ts$/;
 export class Extractor {
  constructor(
      private program: ts.Program, public host: ts.CompilerHost,
      private staticReflector: StaticReflector, private messageBundle: compiler.MessageBundle,
      private reflectorHost: ReflectorHost,
      private metadataResolver: compiler.CompileMetadataResolver,
      private directiveNormalizer: compiler.DirectiveNormalizer) {}
  private readFileMetadata(absSourcePath: string): FileMetadata {
    const moduleMetadata = this.staticReflector.getModuleMetadata(absSourcePath);
    const result: FileMetadata = {components: [], ngModules: [], fileUrl: absSourcePath};
    if (!moduleMetadata) {
      console.log(`WARNING: no metadata found for ${absSourcePath}`);
      return result;
    }
    const metadata = moduleMetadata['metadata'];
    const symbols = metadata && Object.keys(metadata);
    if (!symbols || !symbols.length) {
      return result;
    }
    for (const symbol of symbols) {
      if (metadata[symbol] && metadata[symbol].__symbolic == 'error') {
        // Ignore symbols that are only included to record error information.
        continue;
      }
      const staticType = this.reflectorHost.findDeclaration(absSourcePath, symbol, absSourcePath);
      const annotations = this.staticReflector.annotations(staticType);
      annotations.forEach((annotation) => {
        if (annotation instanceof NgModule) {
          result.ngModules.push(staticType);
        } else if (annotation instanceof Component) {
          result.components.push(staticType);
        }
      });
    }
    return result;
  }
  extract(): Promise<compiler.MessageBundle> {
    const filePaths =
        this.program.getSourceFiles().map(sf => sf.fileName).filter(f => !GENERATED_FILES.test(f));
    const fileMetas = filePaths.map((filePath) => this.readFileMetadata(filePath));
    const ngModules = fileMetas.reduce((ngModules, fileMeta) => {
      ngModules.push(...fileMeta.ngModules);
      return ngModules;
    }, <StaticSymbol[]>[]);
    const analyzedNgModules = compiler.analyzeModules(ngModules, this.metadataResolver);
    const errors: compiler.ParseError[] = [];
    let bundlePromise =
        Promise
            .all(fileMetas.map((fileMeta) => {
              const url = fileMeta.fileUrl;
              return Promise.all(fileMeta.components.map(compType => {
                const compMeta = this.metadataResolver.getDirectiveMetadata(<any>compType);
                const ngModule = analyzedNgModules.ngModuleByDirective.get(compType);
                if (!ngModule) {
                  throw new Error(
                      `Cannot determine the module for component ${compMeta.type.name}!`);
                }
                return Promise
                    .all([compMeta, ...ngModule.transitiveModule.directives].map(
                        dirMeta =>
                            this.directiveNormalizer.normalizeDirective(dirMeta).asyncResult))
                    .then((normalizedCompWithDirectives) => {
                      const compMeta = normalizedCompWithDirectives[0];
                      const html = compMeta.template.template;
                      const interpolationConfig =
                          compiler.InterpolationConfig.fromArray(compMeta.template.interpolation);
                      errors.push(
                          ...this.messageBundle.updateFromTemplate(html, url, interpolationConfig));
                    });
              }));
            }))
            .then(_ => this.messageBundle);
    if (errors.length) {
      throw new Error(errors.map(e => e.toString()).join('\n'));
    }
    return bundlePromise;
  }
  static create(
      options: tsc.AngularCompilerOptions, translationsFormat: string, program: ts.Program,
      compilerHost: ts.CompilerHost, htmlParser: compiler.I18NHtmlParser,
      reflectorHostContext?: ReflectorHostContext): Extractor {
    const resourceLoader: compiler.ResourceLoader = {
      get: (s: string) => {
        if (!compilerHost.fileExists(s)) {
          // TODO: We should really have a test for error cases like this!
          throw new Error(`Compilation failed. Resource file not found: ${s}`);
        }
        return Promise.resolve(compilerHost.readFile(s));
      }
    };
    const urlResolver: compiler.UrlResolver = compiler.createOfflineCompileUrlResolver();
    const reflectorHost = new ReflectorHost(program, compilerHost, options, reflectorHostContext);
    const staticReflector = new StaticReflector(reflectorHost);
    StaticAndDynamicReflectionCapabilities.install(staticReflector);
    const config = new compiler.CompilerConfig({
      genDebugInfo: options.debug === true,
      defaultEncapsulation: ViewEncapsulation.Emulated,
      logBindingUpdate: false,
      useJit: false
    });
    const normalizer =
        new compiler.DirectiveNormalizer(resourceLoader, urlResolver, htmlParser, config);
    const elementSchemaRegistry = new compiler.DomElementSchemaRegistry();
    const resolver = new compiler.CompileMetadataResolver(
        new compiler.NgModuleResolver(staticReflector),
        new compiler.DirectiveResolver(staticReflector), new compiler.PipeResolver(staticReflector),
        elementSchemaRegistry, staticReflector);
    // TODO(vicb): implicit tags & attributes
    let messageBundle = new compiler.MessageBundle(htmlParser, [], {});
    return new Extractor(
        program, compilerHost, staticReflector, messageBundle, reflectorHost, resolver, normalizer);
  }
 }
 interface FileMetadata {
  fileUrl: string;
  components: StaticSymbol[];
  ngModules: StaticSymbol[];
 }
 // Entry point
 if (require.main === module) {
  const args = require('minimist')(process.argv.slice(2));
--- a/modules/@angular/compiler-cli/src/extractor.ts
+++ b/modules/@angular/compiler-cli/src/extractor.ts
@ -1,99 +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
 */
 /**
 * Extract i18n messages from source code
 */
 // Must be imported first, because angular2 decorators throws on load.
 import 'reflect-metadata';
 import * as compiler from '@angular/compiler';
 import {ViewEncapsulation} from '@angular/core';
 import * as tsc from '@angular/tsc-wrapped';
 import * as ts from 'typescript';
 import {extractProgramSymbols} from './codegen';
 import {ReflectorHost} from './reflector_host';
 import {StaticAndDynamicReflectionCapabilities} from './static_reflection_capabilities';
 import {StaticReflector, StaticSymbol} from './static_reflector';
 export class Extractor {
  constructor(
      private options: tsc.AngularCompilerOptions, private program: ts.Program,
      public host: ts.CompilerHost, private staticReflector: StaticReflector,
      private messageBundle: compiler.MessageBundle, private reflectorHost: ReflectorHost,
      private metadataResolver: compiler.CompileMetadataResolver) {}
  extract(): Promise<compiler.MessageBundle> {
    const programSymbols: StaticSymbol[] =
        extractProgramSymbols(this.program, this.staticReflector, this.reflectorHost, this.options);
    const {ngModules, files} = compiler.analyzeAndValidateNgModules(
        programSymbols, {transitiveModules: true}, this.metadataResolver);
    return compiler.loadNgModuleDirectives(ngModules).then(() => {
      const errors: compiler.ParseError[] = [];
      files.forEach(file => {
        const compMetas: compiler.CompileDirectiveMetadata[] = [];
        file.directives.forEach(directiveType => {
          const dirMeta = this.metadataResolver.getDirectiveMetadata(directiveType);
          if (dirMeta && dirMeta.isComponent) {
            compMetas.push(dirMeta);
          }
        });
        compMetas.forEach(compMeta => {
          const html = compMeta.template.template;
          const interpolationConfig =
              compiler.InterpolationConfig.fromArray(compMeta.template.interpolation);
          errors.push(
              ...this.messageBundle.updateFromTemplate(html, file.srcUrl, interpolationConfig));
        });
      });
      if (errors.length) {
        throw new Error(errors.map(e => e.toString()).join('\n'));
      }
      return this.messageBundle;
    });
  }
  static create(
      options: tsc.AngularCompilerOptions, translationsFormat: string, program: ts.Program,
      compilerHost: ts.CompilerHost, resourceLoader: compiler.ResourceLoader,
      reflectorHost?: ReflectorHost): Extractor {
    const htmlParser = new compiler.I18NHtmlParser(new compiler.HtmlParser());
    const urlResolver: compiler.UrlResolver = compiler.createOfflineCompileUrlResolver();
    if (!reflectorHost) reflectorHost = new ReflectorHost(program, compilerHost, options);
    const staticReflector = new StaticReflector(reflectorHost);
    StaticAndDynamicReflectionCapabilities.install(staticReflector);
    const config = new compiler.CompilerConfig({
      genDebugInfo: options.debug === true,
      defaultEncapsulation: ViewEncapsulation.Emulated,
      logBindingUpdate: false,
      useJit: false
    });
    const normalizer =
        new compiler.DirectiveNormalizer(resourceLoader, urlResolver, htmlParser, config);
    const elementSchemaRegistry = new compiler.DomElementSchemaRegistry();
    const resolver = new compiler.CompileMetadataResolver(
        new compiler.NgModuleResolver(staticReflector),
        new compiler.DirectiveResolver(staticReflector), new compiler.PipeResolver(staticReflector),
        elementSchemaRegistry, normalizer, staticReflector);
    // TODO(vicb): implicit tags & attributes
    const messageBundle = new compiler.MessageBundle(htmlParser, [], {});
    return new Extractor(
        options, program, compilerHost, staticReflector, messageBundle, reflectorHost, resolver);
  }
 }
--- a/modules/@angular/compiler-cli/src/main.ts
+++ b/modules/@angular/compiler-cli/src/main.ts
@ -19,9 +19,7 @@ import {CodeGenerator} from './codegen';
 function codegen(
    ngOptions: tsc.AngularCompilerOptions, cliOptions: tsc.NgcCliOptions, program: ts.Program,
    host: ts.CompilerHost) {
-  return CodeGenerator.create(ngOptions, cliOptions, program, host).codegen({
+  return CodeGenerator.create(ngOptions, cliOptions, program, host).codegen();
    transitiveModules: true
  });
 }
 // CLI entry point
--- a/modules/@angular/compiler-cli/src/path_mapped_reflector_host.ts
+++ b/modules/@angular/compiler-cli/src/path_mapped_reflector_host.ts
@ -34,7 +34,7 @@ export class PathMappedReflectorHost extends ReflectorHost {
  getCanonicalFileName(fileName: string): string {
    if (!fileName) return fileName;
    // NB: the rootDirs should have been sorted longest-first
-    for (const dir of this.options.rootDirs || []) {
+    for (let dir of this.options.rootDirs || []) {
      if (fileName.indexOf(dir) === 0) {
        fileName = fileName.substring(dir.length);
      }
@ -49,7 +49,7 @@ export class PathMappedReflectorHost extends ReflectorHost {
          ts.resolveModuleName(m, rootedContainingFile, this.options, this.context).resolvedModule;
      if (resolved) {
        if (this.options.traceResolution) {
-          console.error('resolve', m, containingFile, '=>', resolved.resolvedFileName);
+          console.log('resolve', m, containingFile, '=>', resolved.resolvedFileName);
        }
        return resolved.resolvedFileName;
      }
@ -67,7 +67,7 @@ export class PathMappedReflectorHost extends ReflectorHost {
    containingFile = this.resolveAssetUrl(containingFile, '');
    if (this.options.traceResolution) {
-      console.error(
+      console.log(
          'getImportPath from containingFile', containingFile, 'to importedFile', importedFile);
    }
@ -86,7 +86,7 @@ export class PathMappedReflectorHost extends ReflectorHost {
      return resolved && resolved.replace(EXT, '') === importedFile.replace(EXT, '');
    };
-    const importModuleName = importedFile.replace(EXT, '');
+    let importModuleName = importedFile.replace(EXT, '');
    const parts = importModuleName.split(path.sep).filter(p => !!p);
    let foundRelativeImport: string;
    for (let index = parts.length - 1; index >= 0; index--) {
--- a/modules/@angular/compiler-cli/src/reflector_host.ts
+++ b/modules/@angular/compiler-cli/src/reflector_host.ts
@ -40,7 +40,7 @@ export class ReflectorHost implements StaticReflectorHost, ImportGenerator {
    this.genDir = path.normalize(path.join(this.options.genDir, '.')).replace(/\\/g, '/');
    this.context = context || new NodeReflectorHostContext(compilerHost);
-    const genPath: string = path.relative(this.basePath, this.genDir);
+    var genPath: string = path.relative(this.basePath, this.genDir);
    this.isGenDirChildOfRootDir = genPath === '' || !genPath.startsWith('..');
  }
@ -67,13 +67,13 @@ export class ReflectorHost implements StaticReflectorHost, ImportGenerator {
  };
  protected normalizeAssetUrl(url: string): string {
-    const assetUrl = AssetUrl.parse(url);
+    let assetUrl = AssetUrl.parse(url);
    const path = assetUrl ? `${assetUrl.packageName}/${assetUrl.modulePath}` : null;
    return this.getCanonicalFileName(path);
  }
  protected resolveAssetUrl(url: string, containingFile: string): string {
-    const assetUrl = this.normalizeAssetUrl(url);
+    let assetUrl = this.normalizeAssetUrl(url);
    if (assetUrl) {
      return this.getCanonicalFileName(this.resolve(assetUrl, containingFile));
    }
@ -110,7 +110,7 @@ export class ReflectorHost implements StaticReflectorHost, ImportGenerator {
    // drop extension
    importedFile = importedFile.replace(EXT, '');
-    const nodeModulesIndex = importedFile.indexOf(NODE_MODULES);
+    var nodeModulesIndex = importedFile.indexOf(NODE_MODULES);
    const importModule = nodeModulesIndex === -1 ?
        null :
        importedFile.substring(nodeModulesIndex + NODE_MODULES.length);
@ -141,7 +141,7 @@ export class ReflectorHost implements StaticReflectorHost, ImportGenerator {
  }
  private dotRelative(from: string, to: string): string {
-    const rPath: string = path.relative(from, to).replace(/\\/g, '/');
+    var rPath: string = path.relative(from, to).replace(/\\/g, '/');
    return rPath.startsWith('.') ? rPath : './' + rPath;
  }
@ -149,7 +149,7 @@ export class ReflectorHost implements StaticReflectorHost, ImportGenerator {
   * Moves the path into `genDir` folder while preserving the `node_modules` directory.
   */
  private rewriteGenDirPath(filepath: string) {
-    const nodeModulesIndex = filepath.indexOf(NODE_MODULES);
+    var nodeModulesIndex = filepath.indexOf(NODE_MODULES);
    if (nodeModulesIndex !== -1) {
      // If we are in node_modulse, transplant them into `genDir`.
      return path.join(this.genDir, filepath.substring(nodeModulesIndex));
@ -172,7 +172,7 @@ export class ReflectorHost implements StaticReflectorHost, ImportGenerator {
    }
    try {
-      const assetUrl = this.normalizeAssetUrl(module);
+      let assetUrl = this.normalizeAssetUrl(module);
      if (assetUrl) {
        module = assetUrl;
      }
@ -250,12 +250,6 @@ export class ReflectorHost implements StaticReflectorHost, ImportGenerator {
    } else {
      const sf = this.program.getSourceFile(filePath);
      if (!sf) {
        if (this.context.fileExists(filePath)) {
          const sourceText = this.context.readFile(filePath);
          return this.metadataCollector.getMetadata(
              ts.createSourceFile(filePath, sourceText, ts.ScriptTarget.Latest, true));
        }
        throw new Error(`Source file ${filePath} not present in program.`);
      }
      return this.metadataCollector.getMetadata(sf);
@ -288,7 +282,7 @@ export class ReflectorHost implements StaticReflectorHost, ImportGenerator {
      }
      return resolvedModulePath;
    };
-    const metadata = this.getResolverMetadata(filePath);
+    let metadata = this.getResolverMetadata(filePath);
    if (metadata) {
      // If we have metadata for the symbol, this is the original exporting location.
      if (metadata.metadata[symbolName]) {
--- a/modules/@angular/compiler-cli/src/static_reflector.ts
+++ b/modules/@angular/compiler-cli/src/static_reflector.ts
@ -25,7 +25,7 @@ export interface StaticReflectorHost {
   * @param modulePath is a string identifier for a module as an absolute path.
   * @returns the metadata for the given module.
   */
-  getMetadataFor(modulePath: string): {[key: string]: any}|{[key: string]: any}[];
+  getMetadataFor(modulePath: string): {[key: string]: any};
  /**
   * Resolve a symbol from an import statement form, to the file where it is declared.
@ -72,12 +72,13 @@ export class StaticReflector implements ReflectorReader {
  constructor(private host: StaticReflectorHost) { this.initializeConversionMap(); }
  importUri(typeOrFunc: StaticSymbol): string {
-    const staticSymbol = this.host.findDeclaration(typeOrFunc.filePath, typeOrFunc.name, '');
+    var staticSymbol = this.host.findDeclaration(typeOrFunc.filePath, typeOrFunc.name, '');
    return staticSymbol ? staticSymbol.filePath : null;
  }
  resolveIdentifier(name: string, moduleUrl: string, runtime: any): any {
-    return this.host.findDeclaration(moduleUrl, name, '');
+    const result = this.host.findDeclaration(moduleUrl, name, '');
    return result;
  }
  resolveEnum(enumIdentifier: any, name: string): any {
@ -88,7 +89,7 @@ export class StaticReflector implements ReflectorReader {
  public annotations(type: StaticSymbol): any[] {
    let annotations = this.annotationCache.get(type);
    if (!annotations) {
-      const classMetadata = this.getTypeMetadata(type);
+      let classMetadata = this.getTypeMetadata(type);
      if (classMetadata['decorators']) {
        annotations = this.simplify(type, classMetadata['decorators']);
      } else {
@ -102,11 +103,11 @@ export class StaticReflector implements ReflectorReader {
  public propMetadata(type: StaticSymbol): {[key: string]: any} {
    let propMetadata = this.propertyCache.get(type);
    if (!propMetadata) {
-      const classMetadata = this.getTypeMetadata(type);
+      let classMetadata = this.getTypeMetadata(type);
-      const members = classMetadata ? classMetadata['members'] : {};
+      let members = classMetadata ? classMetadata['members'] : {};
      propMetadata = mapStringMap(members, (propData, propName) => {
-        const prop = (<any[]>propData)
+        let prop = (<any[]>propData)
-                         .find(a => a['__symbolic'] == 'property' || a['__symbolic'] == 'method');
+                       .find(a => a['__symbolic'] == 'property' || a['__symbolic'] == 'method');
        if (prop && prop['decorators']) {
          return this.simplify(type, prop['decorators']);
        } else {
@ -125,20 +126,21 @@ export class StaticReflector implements ReflectorReader {
    try {
      let parameters = this.parameterCache.get(type);
      if (!parameters) {
-        const classMetadata = this.getTypeMetadata(type);
+        let classMetadata = this.getTypeMetadata(type);
-        const members = classMetadata ? classMetadata['members'] : null;
+        let members = classMetadata ? classMetadata['members'] : null;
-        const ctorData = members ? members['__ctor__'] : null;
+        let ctorData = members ? members['__ctor__'] : null;
        if (ctorData) {
-          const ctor = (<any[]>ctorData).find(a => a['__symbolic'] == 'constructor');
+          let ctor = (<any[]>ctorData).find(a => a['__symbolic'] == 'constructor');
-          const parameterTypes = <any[]>this.simplify(type, ctor['parameters'] || []);
+          let parameterTypes = <any[]>this.simplify(type, ctor['parameters'] || []);
-          const parameterDecorators = <any[]>this.simplify(type, ctor['parameterDecorators'] || []);
+          let parameterDecorators = <any[]>this.simplify(type, ctor['parameterDecorators'] || []);
          parameters = [];
          parameterTypes.forEach((paramType, index) => {
-            const nestedResult: any[] = [];
+            let nestedResult: any[] = [];
            if (paramType) {
              nestedResult.push(paramType);
            }
-            const decorators = parameterDecorators ? parameterDecorators[index] : null;
+            let decorators = parameterDecorators ? parameterDecorators[index] : null;
            if (decorators) {
              nestedResult.push(...decorators);
            }
@ -152,7 +154,7 @@ export class StaticReflector implements ReflectorReader {
      }
      return parameters;
    } catch (e) {
-      console.error(`Failed on type ${JSON.stringify(type)} with error ${e}`);
+      console.log(`Failed on type ${JSON.stringify(type)} with error ${e}`);
      throw e;
    }
  }
@ -236,9 +238,9 @@ export class StaticReflector implements ReflectorReader {
  /** @internal */
  public simplify(context: StaticSymbol, value: any): any {
-    const _this = this;
+    let _this = this;
    let scope = BindingScope.empty;
-    const calling = new Map<StaticSymbol, boolean>();
+    let calling = new Map<StaticSymbol, boolean>();
    function simplifyInContext(context: StaticSymbol, value: any, depth: number): any {
      function resolveReference(context: StaticSymbol, expression: any): StaticSymbol {
@ -253,15 +255,16 @@ export class StaticReflector implements ReflectorReader {
      }
      function resolveReferenceValue(staticSymbol: StaticSymbol): any {
-        const moduleMetadata = _this.getModuleMetadata(staticSymbol.filePath);
+        let result: any = staticSymbol;
-        const declarationValue =
+        let moduleMetadata = _this.getModuleMetadata(staticSymbol.filePath);
        let declarationValue =
            moduleMetadata ? moduleMetadata['metadata'][staticSymbol.name] : null;
        return declarationValue;
      }
      function isOpaqueToken(context: StaticSymbol, value: any): boolean {
        if (value && value.__symbolic === 'new' && value.expression) {
-          const target = value.expression;
+          let target = value.expression;
          if (target.__symbolic == 'reference') {
            return sameSymbol(resolveReference(context, target), _this.opaqueToken);
          }
@ -272,7 +275,7 @@ export class StaticReflector implements ReflectorReader {
      function simplifyCall(expression: any) {
        let callContext: {[name: string]: string}|undefined = undefined;
        if (expression['__symbolic'] == 'call') {
-          const target = expression['expression'];
+          let target = expression['expression'];
          let functionSymbol: StaticSymbol;
          let targetFunction: any;
          if (target) {
@ -315,7 +318,7 @@ export class StaticReflector implements ReflectorReader {
                for (let i = 0; i < parameters.length; i++) {
                  functionScope.define(parameters[i], args[i]);
                }
-                const oldScope = scope;
+                let oldScope = scope;
                let result: any;
                try {
                  scope = functionScope.done();
@ -346,19 +349,19 @@ export class StaticReflector implements ReflectorReader {
          return expression;
        }
        if (expression instanceof Array) {
-          const result: any[] = [];
+          let result: any[] = [];
-          for (const item of (<any>expression)) {
+          for (let item of (<any>expression)) {
            // Check for a spread expression
            if (item && item.__symbolic === 'spread') {
-              const spreadArray = simplify(item.expression);
+              let spreadArray = simplify(item.expression);
              if (Array.isArray(spreadArray)) {
-                for (const spreadItem of spreadArray) {
+                for (let spreadItem of spreadArray) {
                  result.push(spreadItem);
                }
                continue;
              }
            }
-            const value = simplify(item);
+            let value = simplify(item);
            if (shouldIgnore(value)) {
              continue;
            }
@ -465,8 +468,8 @@ export class StaticReflector implements ReflectorReader {
                return null;
              case 'reference':
                if (!expression.module) {
-                  const name: string = expression['name'];
+                  let name: string = expression['name'];
-                  const localValue = scope.resolve(name);
+                  let localValue = scope.resolve(name);
                  if (localValue != BindingScope.missing) {
                    return localValue;
                  }
@ -515,8 +518,6 @@ export class StaticReflector implements ReflectorReader {
                if (expression['line']) {
                  message =
                      `${message} (position ${expression['line']+1}:${expression['character']+1} in the original .ts file)`;
                  throw positionalError(
                      message, context.filePath, expression['line'], expression['character']);
                }
                throw new Error(message);
            }
@ -530,15 +531,11 @@ export class StaticReflector implements ReflectorReader {
      try {
        return simplify(value);
      } catch (e) {
-        const message = `${e.message}, resolving symbol ${context.name} in ${context.filePath}`;
+        throw new Error(`${e.message}, resolving symbol ${context.name} in ${context.filePath}`);
        if (e.fileName) {
          throw positionalError(message, e.fileName, e.line, e.column);
        }
        throw new Error(message);
      }
    }
-    const result = simplifyInContext(context, value, 0);
+    let result = simplifyInContext(context, value, 0);
    if (shouldIgnore(result)) {
      return undefined;
    }
@ -553,7 +550,8 @@ export class StaticReflector implements ReflectorReader {
    if (!moduleMetadata) {
      moduleMetadata = this.host.getMetadataFor(module);
      if (Array.isArray(moduleMetadata)) {
-        moduleMetadata = moduleMetadata.find(md => md['version'] === SUPPORTED_SCHEMA_VERSION) ||
+        moduleMetadata = (<Array<any>>moduleMetadata)
                             .find(element => element.version === SUPPORTED_SCHEMA_VERSION) ||
            moduleMetadata[0];
      }
      if (!moduleMetadata) {
@ -570,8 +568,12 @@ export class StaticReflector implements ReflectorReader {
  }
  private getTypeMetadata(type: StaticSymbol): {[key: string]: any} {
-    const moduleMetadata = this.getModuleMetadata(type.filePath);
+    let moduleMetadata = this.getModuleMetadata(type.filePath);
-    return moduleMetadata['metadata'][type.name] || {__symbolic: 'class'};
+    let result = moduleMetadata['metadata'][type.name];
    if (!result) {
      result = {__symbolic: 'class'};
    }
    return result;
  }
 }
@ -611,9 +613,9 @@ function produceErrorMessage(error: any): string {
 function mapStringMap(input: {[key: string]: any}, transform: (value: any, key: string) => any):
    {[key: string]: any} {
  if (!input) return {};
-  const result: {[key: string]: any} = {};
+  var result: {[key: string]: any} = {};
  Object.keys(input).forEach((key) => {
-    const value = transform(input[key], key);
+    let value = transform(input[key], key);
    if (!shouldIgnore(value)) {
      result[key] = value;
    }
@ -636,7 +638,8 @@ abstract class BindingScope {
  public static empty: BindingScope = {resolve: name => BindingScope.missing};
  public static build(): BindingScopeBuilder {
-    const current = new Map<string, any>();
+    let current = new Map<string, any>();
    let parent: BindingScope = undefined;
    return {
      define: function(name, value) {
        current.set(name, value);
@ -664,11 +667,3 @@ function sameSymbol(a: StaticSymbol, b: StaticSymbol): boolean {
 function shouldIgnore(value: any): boolean {
  return value && value.__symbolic == 'ignore';
 }
 function positionalError(message: string, fileName: string, line: number, column: number): Error {
  const result = new Error(message);
  (result as any).fileName = fileName;
  (result as any).line = line;
  (result as any).column = column;
  return result;
 }
--- a/modules/@angular/compiler-cli/test/mocks.ts
+++ b/modules/@angular/compiler-cli/test/mocks.ts
@ -21,7 +21,7 @@ export class MockContext implements ReflectorHostContext {
  directoryExists(path: string): boolean { return typeof this.getEntry(path) === 'object'; }
  readFile(fileName: string): string|undefined {
-    const data = this.getEntry(fileName);
+    let data = this.getEntry(fileName);
    if (typeof data === 'string') {
      return data;
    }
@ -29,9 +29,9 @@ export class MockContext implements ReflectorHostContext {
  }
  writeFile(fileName: string, data: string): void {
-    const parts = fileName.split('/');
+    let parts = fileName.split('/');
-    const name = parts.pop();
+    let name = parts.pop();
-    const entry = this.getEntry(parts);
+    let entry = this.getEntry(parts);
    if (entry && typeof entry !== 'string') {
      entry[name] = data;
    }
@ -48,11 +48,11 @@ export class MockContext implements ReflectorHostContext {
    parts = normalize(parts);
    let current = this.files;
    while (parts.length) {
-      const part = parts.shift();
+      let part = parts.shift();
      if (typeof current === 'string') {
        return undefined;
      }
-      const next = (<Directory>current)[part];
+      let next = (<Directory>current)[part];
      if (next === undefined) {
        return undefined;
      }
@ -72,9 +72,9 @@ export class MockContext implements ReflectorHostContext {
 }
 function normalize(parts: string[]): string[] {
-  const result: string[] = [];
+  let result: string[] = [];
  while (parts.length) {
-    const part = parts.shift();
+    let part = parts.shift();
    switch (part) {
      case '.':
        break;
@ -102,7 +102,7 @@ export class MockCompilerHost implements ts.CompilerHost {
  getSourceFile(
      fileName: string, languageVersion: ts.ScriptTarget,
      onError?: (message: string) => void): ts.SourceFile {
-    const sourceText = this.context.readFile(fileName);
+    let sourceText = this.context.readFile(fileName);
    if (sourceText) {
      return ts.createSourceFile(fileName, sourceText, languageVersion);
    } else {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Igor Minar	7a1f964201	chore(release): cut the 2.1.1 release	2016-10-20 15:36:02 -07:00
Igor Minar	3dffbb6cf1	docs(changelog): add 2.1.1 changelog	2016-10-20 15:34:35 -07:00
Igor Minar	79f1798b68	chore(release): cut the 2.2.0-beta.0 release and add changelog	2016-10-20 15:31:47 -07:00
Daniel Leib	dd08d421a1	fix(router): do not update primary route if only secondary outlet is given (#11797 )	2016-10-20 15:31:24 -07:00
Victor Savkin	a2d4299f2c	fix(router): module loader should start compiling modules when stubbedModules are set (#11742 )	2016-10-20 15:31:11 -07:00
vsavkin	2598b59de7	cleanup(router): add a test verifying than NavigationEnd is not emitted after NavigationCancel	2016-10-20 15:31:04 -07:00
vsavkin	20b4617289	fix(router): fix lazy loading triggered by redirects from wildcard routes Closes #12183	2016-10-20 15:30:50 -07:00
Tobias Bosch	958bb0da04	refactor(compiler): introduce directive wrappers to generate less code - for now only wraps the `@Input` properties and calls to `ngOnInit`, `ngDoCheck` and `ngOnChanges` of directives. - also groups eval sources by NgModule. Part of #11683	2016-10-20 15:30:27 -07:00
Tobias Bosch	4ba8f1989b	refactor(compiler): don’t use the `OfflineCompiler` in extract_i18n	2016-10-20 15:29:43 -07:00
Tobias Bosch	c04b4d795a	refactor(compiler): remove private exports All of `@angular/compiler` is private, so we can export everything we need directly.	2016-10-20 15:29:25 -07:00
Alex Rickabaugh	f1b5ba9231	chore(ci): re-enable browserstack tests in ci	2016-10-20 15:27:39 -07:00
Peter Bacon Darwin	50b524ba1e	chore(tslint.json): semicolon rule expects an array	2016-10-20 15:27:25 -07:00
Victor Berchet	680ceb7d65	refactor: remove some facades (#12335 )	2016-10-20 15:25:05 -07:00
Dzmitry Shylovich	ea186d5ccd	refactor(forms): remove ListWrapper facades originally cherry-picked from `445e5922ec`	2016-10-20 15:15:32 -07:00
Alex Rickabaugh	10455044f1	chore(ci): make browserstack tests optional until they are fixed	2016-10-20 14:49:01 -07:00
Tobias Bosch	31150fe6e8	feat(benchmark): add large form benchmark This benchmark tracks the generated file size for large forms as well as the time to create and destroy many form fields.	2016-10-20 14:48:02 -07:00
Tobias Bosch	9223066123	fix(benchmarks): fix method name in targetable spec	2016-10-20 14:47:42 -07:00